[zerotier-one/f37] (6 commits) ...fix
by Leigh Scott
Summary of changes:
bb3fac6... chore(update): 1.10.3 (*)
aa4cc96... chore(update): 1.10.6 (*)
bf85460... fix requires (*)
83bb7f7... fix (*)
9683e70... Revert "fix" (*)
e14e680... fix (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 6 months
[zerotier-one] fix
by Leigh Scott
commit e14e680083fe965eedb5ef7b641375734f08b56e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun May 21 17:21:08 2023 +0100
fix
zerotier-one.spec | 6 ++++++
1 file changed, 6 insertions(+)
---
diff --git a/zerotier-one.spec b/zerotier-one.spec
index 09170a3..7e19a70 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -88,6 +88,12 @@ the original Google BeyondCorp paper and the Jericho Forum with its notion of
# rm -rf ext/http-parser
# rm -rf ext/json
+sed \
+ -e 's/RUSTFLAGS=/RUSTFLAGS?=/' \
+ -e 's/cargo build $(RUSTFLAGS)/cargo build --release/' \
+ -i make-linux.mk
+
+
pushd zeroidc
tar -xf %{SOURCE1}
popd
1 year, 6 months
[zerotier-one/f38] (4 commits) ...Revert "fix"
by Leigh Scott
Summary of changes:
aa4cc96... chore(update): 1.10.6 (*)
bf85460... fix requires (*)
83bb7f7... fix (*)
9683e70... Revert "fix" (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 6 months
[zerotier-one] Revert "fix"
by Leigh Scott
commit 9683e70a1bc22090fcd36a4fac78603315f7c2f3
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun May 21 16:55:15 2023 +0100
Revert "fix"
This reverts commit 83bb7f7ee98c29a5aa65d65c423baa6d4a27adf7.
2011.patch | 122 ------------------------------------------------------
zerotier-one.spec | 6 ++-
2 files changed, 4 insertions(+), 124 deletions(-)
---
diff --git a/zerotier-one.spec b/zerotier-one.spec
index 287a59a..09170a3 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,5 +1,8 @@
#global toolchain clang
-%global _default_patch_fuzz 1
+# /usr/bin/debugedit: Cannot handle 8-byte build ID
+%ifarch %{arm}
+%global debug_package %{nil}
+%endif
Name: zerotier-one
Version: 1.10.6
@@ -44,7 +47,6 @@ Source2: zerotier-one-sysusers
# for use vendor directory for build
Patch0: zerotier-use-vendor-archive.patch
-Patch1: https://github.com/zerotier/ZeroTierOne/pull/2011.patch
BuildRequires: cargo
BuildRequires: gcc-c++
1 year, 6 months
[VirtualBox] (#6660) Fix the documentation, the vboxpci module is not shipped since VirtualBox 6.1.0
by Sérgio M. Basto
commit 8aabb667c4d3bfed26e98ae6935e6556cd9eda87
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun May 21 16:43:31 2023 +0100
(#6660) Fix the documentation, the vboxpci module is not shipped since VirtualBox 6.1.0
VirtualBox-6.1.0-strings.patch | 13 ++++++++-----
VirtualBox.spec | 5 ++++-
2 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/VirtualBox-6.1.0-strings.patch b/VirtualBox-6.1.0-strings.patch
index 2e44b14..1a11929 100644
--- a/VirtualBox-6.1.0-strings.patch
+++ b/VirtualBox-6.1.0-strings.patch
@@ -1,6 +1,6 @@
--- ./src/VBox/Frontends/VirtualBox/src/main.cpp.orig 2019-12-19 22:58:49.615873442 +0000
+++ ./src/VBox/Frontends/VirtualBox/src/main.cpp 2019-12-19 23:03:23.696288683 +0000
-@@ -86,10 +86,12 @@ QString g_QStrHintLinuxNoMemory = QAppli
+@@ -97,12 +97,14 @@ QString g_QStrHintLinuxNoMemory = QAppli
);
QString g_QStrHintLinuxNoDriver = QApplication::tr(
@@ -15,9 +15,12 @@
+ "kernel driver, doing as root:"
+ " <font color=blue>akmods; systemctl restart vboxdrv.service</font><br/><br/>"
"If your system has EFI Secure Boot enabled you may also need to sign "
- "the kernel modules (vboxdrv, vboxnetflt, vboxnetadp, vboxpci) before "
+- "the kernel modules (vboxdrv, vboxnetflt, vboxnetadp, vboxpci) before "
++ "the kernel modules (vboxdrv, vboxnetflt, vboxnetadp) before "
"you can load them. Please see your Linux system's documentation for "
-@@ -99,26 +101,29 @@ QString g_QStrHintLinuxNoDriver = QAppli
+ "more information."
+ );
+@@ -110,26 +112,29 @@ QString g_QStrHintLinuxNoDriver = QAppli
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
"The VirtualBox kernel modules do not match this version of "
"VirtualBox. The installation of VirtualBox was apparently not "
@@ -25,7 +28,7 @@
- "VirtualBox."
- );
+ "successful. Executing<br/><br/>"
-+ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxpci vboxdrv; systemctl restart vboxdrv.service</font> as root<br/><br/>"
++ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxdrv; systemctl restart vboxdrv.service</font> as root<br/><br/>"
+ "may correct this. Make sure that you do not mix the "
+ "RPMFusion version and the Oracle version of VirtualBox."
+
@@ -38,7 +41,7 @@
- " <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
- "may correct this. Make sure that you are not mixing builds "
- "of VirtualBox from different sources."
-+ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxpci vboxdrv; systemctl restart vboxdrv.service</font> as root<br/><br/>"
++ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxdrv; systemctl restart vboxdrv.service</font> as root<br/><br/>"
+ "may correct this. Make sure that you do not mix the "
+ "RPMFusion version and the Oracle version of VirtualBox."
);
diff --git a/VirtualBox.spec b/VirtualBox.spec
index f26e63a..9544a22 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -46,7 +46,7 @@
Name: VirtualBox
Version: 7.0.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -900,6 +900,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Sun May 21 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.8-3
+- (#6660) Fix the documentation, the vboxpci module is not shipped since VirtualBox 6.1.0
+
* Wed Apr 19 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.8-2
- sync with virtualbox-guest-additions.spec
- Replaces with sed -i "s/VBOX_ZLIB_STATIC/VBoxZlibStatic/; s/VBOX_ZLIB-x86/VBoxZlib-x86/; s/VBOX_ZLIB/VBoxZlib/; s/VBOX_LIBXML2/VBoxLibXml2/; s/VBOX_VPX/VBoxLibVpx/;s/VBOX_LZF/VBoxLzf/;s/VBOX_LIBPNG/VBoxLibPng/; s/VBOX_LIBCURL/VBoxLibCurl/;s/VBOX_DXVK/VBoxDxVk/;s/VBOX_OGG/VBoxLibOgg/;s/VBOX_VORBIS/VBoxLibVorbis/; s/VBOX_TPMS/VBoxLibTpms/" VirtualBox.spec
1 year, 6 months
[zerotier-one] fix
by Leigh Scott
commit 83bb7f7ee98c29a5aa65d65c423baa6d4a27adf7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun May 21 16:05:00 2023 +0100
fix
2011.patch | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
zerotier-one.spec | 6 +--
2 files changed, 124 insertions(+), 4 deletions(-)
---
diff --git a/2011.patch b/2011.patch
new file mode 100644
index 0000000..d89f983
--- /dev/null
+++ b/2011.patch
@@ -0,0 +1,122 @@
+From 8ea09ba6bde0629d4cd1ab4681a5d96744b718fc Mon Sep 17 00:00:00 2001
+From: Michael C <michael(a)mchang.name>
+Date: Fri, 19 May 2023 13:41:02 -0400
+Subject: [PATCH 1/3] remove rustc --release flag
+
+---
+ make-linux.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/make-linux.mk b/make-linux.mk
+index 3b448afb0..9670bbbf8 100644
+--- a/make-linux.mk
++++ b/make-linux.mk
+@@ -71,7 +71,7 @@ else
+ CXXFLAGS?=-O3 -fstack-protector
+ override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+ LDFLAGS=-pie -Wl,-z,relro,-z,now
+- RUSTFLAGS=--release
++ RUSTFLAGS=
+ endif
+
+ ifeq ($(ZT_QNAP), 1)
+
+From 30c726826721e94c1624abe4ce4b1da39f66bc89 Mon Sep 17 00:00:00 2001
+From: Michael C <michael(a)mchang.name>
+Date: Fri, 19 May 2023 14:44:41 -0400
+Subject: [PATCH 2/3] add CARGOFLAGS
+
+---
+ make-linux.mk | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/make-linux.mk b/make-linux.mk
+index 9670bbbf8..00a557504 100644
+--- a/make-linux.mk
++++ b/make-linux.mk
+@@ -62,6 +62,7 @@ ifeq ($(ZT_DEBUG),1)
+ override CXXFLAGS+=-Wall -Wno-deprecated -g -O -std=c++17 -pthread $(INCLUDES) $(DEFS)
+ ZT_TRACE=1
+ RUSTFLAGS=
++ CARGOFLAGS=
+ # The following line enables optimization for the crypto code, since
+ # C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box!
+ node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CXXFLAGS=-Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
+@@ -72,6 +73,7 @@ else
+ override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+ LDFLAGS=-pie -Wl,-z,relro,-z,now
+ RUSTFLAGS=
++ CARGOFLAGS=--release
+ endif
+
+ ifeq ($(ZT_QNAP), 1)
+@@ -410,8 +412,8 @@ debug: FORCE
+ ifeq ($(ZT_SSO_SUPPORTED), 1)
+ ifeq ($(ZT_EMBEDDED),)
+ zeroidc: FORCE
+-# export PATH=/root/.cargo/bin:$$PATH; cd zeroidc && cargo build -j1 $(RUSTFLAGS)
+- export PATH=/${HOME}/.cargo/bin:$$PATH; cd zeroidc && cargo build $(RUSTFLAGS)
++# export PATH=/root/.cargo/bin:$$PATH; cd zeroidc && cargo build -j1 $(CARGOFLAGS)
++ export PATH=/${HOME}/.cargo/bin:$$PATH; cd zeroidc && cargo build $(CARGOFLAGS)
+ endif
+ else
+ zeroidc:
+@@ -474,6 +476,7 @@ echo_flags:
+ @echo "echo_flags :: CXXFLAGS=$(CXXFLAGS)"
+ @echo "echo_flags :: LDFLAGS=$(LDFLAGS)"
+ @echo "echo_flags :: RUSTFLAGS=$(RUSTFLAGS)"
++ @echo "echo_flags :: CARGOFLAGS=$(CARGOFLAGS)"
+ @echo "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~"
+
+ debian: echo_flags
+
+From 688808dc6303405e2e58a4c6592c8275c5b820e9 Mon Sep 17 00:00:00 2001
+From: Michael C <michael(a)mchang.name>
+Date: Fri, 19 May 2023 15:13:07 -0400
+Subject: [PATCH 3/3] switch to cargo rustc for compiler flags
+
+---
+ make-linux.mk | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/make-linux.mk b/make-linux.mk
+index 00a557504..06107c49a 100644
+--- a/make-linux.mk
++++ b/make-linux.mk
+@@ -62,7 +62,6 @@ ifeq ($(ZT_DEBUG),1)
+ override CXXFLAGS+=-Wall -Wno-deprecated -g -O -std=c++17 -pthread $(INCLUDES) $(DEFS)
+ ZT_TRACE=1
+ RUSTFLAGS=
+- CARGOFLAGS=
+ # The following line enables optimization for the crypto code, since
+ # C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box!
+ node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CXXFLAGS=-Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
+@@ -72,8 +71,7 @@ else
+ CXXFLAGS?=-O3 -fstack-protector
+ override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+ LDFLAGS=-pie -Wl,-z,relro,-z,now
+- RUSTFLAGS=
+- CARGOFLAGS=--release
++ RUSTFLAGS=--release
+ endif
+
+ ifeq ($(ZT_QNAP), 1)
+@@ -412,8 +410,8 @@ debug: FORCE
+ ifeq ($(ZT_SSO_SUPPORTED), 1)
+ ifeq ($(ZT_EMBEDDED),)
+ zeroidc: FORCE
+-# export PATH=/root/.cargo/bin:$$PATH; cd zeroidc && cargo build -j1 $(CARGOFLAGS)
+- export PATH=/${HOME}/.cargo/bin:$$PATH; cd zeroidc && cargo build $(CARGOFLAGS)
++# export PATH=/root/.cargo/bin:$$PATH; cd zeroidc && cargo rustc -j1 $(RUSTFLAGS)
++ export PATH=/${HOME}/.cargo/bin:$$PATH; cd zeroidc && cargo rustc $(RUSTFLAGS)
+ endif
+ else
+ zeroidc:
+@@ -476,7 +474,6 @@ echo_flags:
+ @echo "echo_flags :: CXXFLAGS=$(CXXFLAGS)"
+ @echo "echo_flags :: LDFLAGS=$(LDFLAGS)"
+ @echo "echo_flags :: RUSTFLAGS=$(RUSTFLAGS)"
+- @echo "echo_flags :: CARGOFLAGS=$(CARGOFLAGS)"
+ @echo "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~"
+
+ debian: echo_flags
diff --git a/zerotier-one.spec b/zerotier-one.spec
index 09170a3..287a59a 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,8 +1,5 @@
#global toolchain clang
-# /usr/bin/debugedit: Cannot handle 8-byte build ID
-%ifarch %{arm}
-%global debug_package %{nil}
-%endif
+%global _default_patch_fuzz 1
Name: zerotier-one
Version: 1.10.6
@@ -47,6 +44,7 @@ Source2: zerotier-one-sysusers
# for use vendor directory for build
Patch0: zerotier-use-vendor-archive.patch
+Patch1: https://github.com/zerotier/ZeroTierOne/pull/2011.patch
BuildRequires: cargo
BuildRequires: gcc-c++
1 year, 6 months
[zerotier-one] fix requires
by Leigh Scott
commit bf8546002689d38dd583e3f900c696de9ac0ba24
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun May 21 15:33:36 2023 +0100
fix requires
zerotier-one.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/zerotier-one.spec b/zerotier-one.spec
index dbfd279..09170a3 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -58,6 +58,8 @@ Provides: bundled(json) = 3.10.2
Provides: bundled(salsa2012)
Requires: openssl1.1
+%{?systemd_requires}
+%{?sysusers_requires_compat}
%description
ZeroTier is a smart programmable Ethernet switch for planet Earth. It allows all
1 year, 6 months
[zerotier-one] chore(update): 1.10.6
by Leigh Scott
commit aa4cc967d5bcd14ea27d06897571f81a43ab939e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun May 21 15:25:04 2023 +0100
chore(update): 1.10.6
sources | 4 ++--
zerotier-one-sysusers | 1 +
zerotier-one.spec | 16 ++++++++++++----
zerotier-use-vendor-archive.patch | 18 +++++++++++-------
4 files changed, 26 insertions(+), 13 deletions(-)
---
diff --git a/sources b/sources
index 8aa9cff..cd35f52 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (zerotier-one-1.10.3.tar.gz) = 8012a76e9fa541d4acad58bd7bd2a133e1946b55a2fda8983e3829287a2b2eddc63ff9893c70e8a04b4ef705a63d7d4375c6aceb77132ca09a3b405a116ccab7
-SHA512 (vendor-1.10.3.tar.xz) = ce973e27391f485428517353532dffe045c003f9d8f21419a1b98b93ea0644f997350b85bb974daea0eccfb8f11b2205ff184c8c3da658d5daa78500a0b98bef
+SHA512 (zerotier-one-1.10.6.tar.gz) = e22982e0898d5db4748ca009480cc6ea07b13e1cf3dcb2c78fbba5036519c0d08afe8bdad20766669f52fef03679ff228414337e2478990fd5ba5d3dbece1972
+SHA512 (vendor-1.10.6.tar.xz) = 87039ed80350d7c343aac70009e72a841cd4b648d6fc95974827e5d5b2324ce0a81e5d37ba94a7bc2db1bfd94b50e3ff7e69af29ad1423cda5c38fa64b8d1d7d
diff --git a/zerotier-one-sysusers b/zerotier-one-sysusers
new file mode 100644
index 0000000..13a1436
--- /dev/null
+++ b/zerotier-one-sysusers
@@ -0,0 +1 @@
+u zerotier-one - "ZeroTier One user" /var/lib/zerotier-one /usr/bin/nologin
diff --git a/zerotier-one.spec b/zerotier-one.spec
index a30b1fc..dbfd279 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,11 +1,11 @@
-%global toolchain clang
+#global toolchain clang
# /usr/bin/debugedit: Cannot handle 8-byte build ID
%ifarch %{arm}
%global debug_package %{nil}
%endif
Name: zerotier-one
-Version: 1.10.3
+Version: 1.10.6
Release: 1%{?dist}
Summary: Smart Ethernet Switch for Earth
@@ -43,12 +43,13 @@ URL: https://zerotier.com
Source0: https://github.com/zerotier/ZeroTierOne/archive/%{version}/%{name}-%{vers...
# make with command: 'cd zeroidc && cargo vendor' and tar.xz vendor directory
Source1: vendor-%{version}.tar.xz
+Source2: zerotier-one-sysusers
# for use vendor directory for build
Patch0: zerotier-use-vendor-archive.patch
BuildRequires: cargo
-BuildRequires: clang
+BuildRequires: gcc-c++
BuildRequires: openssl1.1-devel openssl1.1
BuildRequires: systemd-rpm-macros
@@ -98,8 +99,11 @@ popd
%install
%make_install
-install -Dpm0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
+install -D -m0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
+install -D -m0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
+%pre
+%sysusers_create_compat %{SOURCE2}
%post
%systemd_post %{name}.service
@@ -117,10 +121,14 @@ install -Dpm0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
%{_mandir}/man{1,8}/*.{1,8}*
%{_sbindir}/zerotier-*
%{_sharedstatedir}/%{name}/
+%{_sysusersdir}/%{name}.conf
%{_unitdir}/*.service
%changelog
+* Sun May 21 2023 Leigh Scott <leigh123linux(a)gmail.com> - 1.10.6-1
+- chore(update): 1.10.6
+
* Fri Feb 17 2023 Leigh Scott <leigh123linux(a)gmail.com> - 1.10.3-1
- chore(update): 1.10.3
diff --git a/zerotier-use-vendor-archive.patch b/zerotier-use-vendor-archive.patch
index a7e918d..ae2794d 100644
--- a/zerotier-use-vendor-archive.patch
+++ b/zerotier-use-vendor-archive.patch
@@ -1,13 +1,17 @@
--- a/zeroidc/.cargo/config.toml
+++ b/zeroidc/.cargo/config.toml
-@@ -1,6 +1,10 @@
- [source.crates-io]
- replace-with = "vendored-sources"
+@@ -9,3 +9,14 @@ rustflags = ["-C", "target-feature=+crt-
-+[source."https://github.com/glimberg/rust-jwt"]
+ [target.i686-pc-windows-msvc]
+ rustflags = ["-C", "target-feature=+crt-static"]
++
++[source.crates-io]
++replace-with = "vendored-sources"
++
++[source."git+https://github.com/glimberg/rust-jwt"]
+git = "https://github.com/glimberg/rust-jwt"
+replace-with = "vendored-sources"
+
- [source.vendored-sources]
- directory = "vendor"
-
++[source.vendored-sources]
++directory = "vendor"
++
1 year, 6 months
[ProjectX] Update to current packaging standards
by Göran Uddeborg
commit 02d1f5679e7b15c7ba8d132261bb30ce58ac8964
Author: Göran Uddeborg <goeran(a)uddeborg.se>
Date: Sat May 20 19:20:09 2023 +0200
Update to current packaging standards
ProjectX.spec | 154 +++++-----------------------------------------------------
changelog | 131 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 144 insertions(+), 141 deletions(-)
---
diff --git a/ProjectX.spec b/ProjectX.spec
index a8da47f..e270c67 100644
--- a/ProjectX.spec
+++ b/ProjectX.spec
@@ -1,10 +1,10 @@
Name: ProjectX
Version: 0.91.0
-Release: 21%{?dist}
+Release: %autorelease
Summary: DVB video editing and demultiplexing tool
Summary(sv): Verktyg för redigering och demultiplexning av DVB-video
-License: GPLv2+
+License: GPL-2.0-or-later
URL: http://project-x.sourceforge.net/
Source0: http://downloads.sourceforge.net/project/project-x/project-x/%{name}_%ver...
@@ -15,6 +15,8 @@ Patch1: %name-0.90.4.00-20100806cvs.desktop.patch
Patch2: %name-0.90.4.00-20100806cvs.helpfiles.patch
Patch3: projectx_0.91.0.08_IDCTFast.patch
+ExclusiveArch: %java_arches
+
BuildRequires: gcc
BuildRequires: java-devel >= 1.2.2
BuildRequires: jakarta-oro
@@ -52,15 +54,15 @@ mottagningen.
mv Project-X/lib/PORTABLE lib
mv Project-X/src/net/sourceforge/dvb/projectx/video/IDCTFast.java \
src/net/sourceforge/dvb/projectx/video
-%patch0
-%patch1
-%patch2
+%patch 0
+%patch 1
+%patch 2
# Patch 3 uses clean newlines, but the files it patches uses CRLF as distributed.
# Fix the documentation files similarily.
dos2unix noguisources.lst sources.lst \
src/net/sourceforge/dvb/projectx/video/MpvDecoder.java \
Copying ReadMe.txt ReleaseNotes_0.91.0.txt
-%patch3 -p2
+%patch 3 -p2
sed -i '/Class-Path/d' MANIFEST.MF
@@ -68,10 +70,10 @@ sed -i '/Class-Path/d' MANIFEST.MF
sh -ex build.sh
make -C lib/PORTABLE PROJECTX_HOME=%_builddir/Project-X_%version \
%ifarch i686 x86_64 ia64
- IDCT=idct-mjpeg-mmx \
+ IDCT=idct-mjpeg-mmx \
%endif
- CPLAT="%optflags -fPIC" \
- CINC="-I%_jvmdir/java/include -I%_jvmdir/java/include/linux"
+ CPLAT="%optflags -fPIC" \
+ CINC="-I%_jvmdir/java/include -I%_jvmdir/java/include/linux"
%install
@@ -86,7 +88,7 @@ cp -p %SOURCE2 %buildroot%_datadir/metainfo
%check
appstream-util validate-relax --nonet \
- %buildroot%_datadir/metainfo/projectx.appdata.xml
+ %buildroot%_datadir/metainfo/projectx.appdata.xml
%files
%license Copying
@@ -99,134 +101,4 @@ appstream-util validate-relax --nonet \
%changelog
-* Sat Aug 06 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.91.0-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
- 5.1
-
-* Tue Feb 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.91.0-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Feb 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Sep 10 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.91.0-17
-- Fix appdata
-
-* Tue Sep 1 2020 Göran Uddeborg <goeran(a)uddeborg.se> 0.91.0-16
-- Remove inccorrectly commited source from git.
-
-* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Feb 28 2018 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.91.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Sep 19 2017 Göran Uddeborg <goeran(a)uddeborg.se> 0.91.0-9
-- Appdata added.
-
-* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.91.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Mar 18 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.91.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 25 2015 Göran Uddeborg <goeran(a)uddeborg.se> - 0.91.0-6
-- Use MMX instructions only on architectures that have them (BZ3549)
-
-* Fri Feb 13 2015 Göran Uddeborg <goeran(a)uddeborg.se> - 0.91.0-5
-- Build with fast-math (BZ3499)
-- Separate licence from documentation files
-- Skip obsolete defattr declaration
-- Include the release notes in the documentation
-- Use standard line endings in the documentation and license files
-- Fix some minor lint
-
-* Sat Oct 25 2014 Sérgio Basto <sergio(a)serjux.com> - 0.91.0-4
-- add %{?dist} tag
-
-* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.91.0-3
-- Mass rebuilt for Fedora 19 Features
-
-* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.91.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sun Jun 19 2011 Göran Uddeborg <goeran(a)uddeborg.se> - 0.91.0
-- New upstreams version. This is an official release, not a snapshot
- any more.
-
-* Mon Jun 13 2011 Göran Uddeborg <goeran(a)uddeborg.se> - 0.90.4.00-10.20100806cvs
-- Adjust to updated packaging guidelines:
-- + Build wrapper script using the jpackage_script macro.
-- + Remove support for GCJ.
-
-* Fri Oct 15 2010 Göran Uddeborg <goeran(a)uddeborg.se> - 0.90.4.00-9.20100806cvs
-- jakarta-commons-net has been replaced with apache-commons-net. Requirements
- updated.
-
-* Fri Oct 15 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 0.90.4.00-8.20100806cvs
-- Rebuilt for gcc bug
-
-* Tue Aug 10 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-7.20100806cvs
-- Remove the requirement on Java 1.6. GCJ (ECJ) is fine for bytecode
- compilation.
-
-* Sat Aug 7 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-6.20100806cvs
-- Added version number to sysjava patch, indicating for which version it was
- made.
-- Require Java 1.6, to get a newer compiler than GCJ's.
-- Omit "lib" subdirectory and other bits not needed on Linux from the archive.
- Takes away the need to remove "lib" in "prep" section.
-- Compress the archive with xz rather than bzip2.
-- Update to snapshot from cvs 2010-08-06.
-- Made a separate patch file for the desktop file modifications.
-- Put the html help documentation in the jar archive, so it can be found in
- installed mode.
-
-* Mon Aug 2 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-5.20100801cvs
-- Include the cvs date in the source package.
-- Explicitly prune empty directories when checking out from CVS.
-- Include a little script that creates the tar file.
-- Make the wrapper script a separate source file.
-- Changed BuildArchitectures tag to BuildArch.
-
-* Sun Aug 1 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-4.20100801cvs
-- Switch to single character spacing of sentences in the description.
-- Add comment on how to recreate the tar archive.
-- Update to snapshot from cvs 2010-08-01.
-- Do double line spacing between major sections.
-- Removed cleaning in install and clean sections, no longer needed from F13.
-
-* Mon Dec 7 2009 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-3.20091201cvs
-- BuildRequires entries on separate lines
-- Don't point out Europe in the description, DVB is used in more places.
-- Build wrapper script using jpackage-utils.
-- Add a desktop file.
-- Explicitly remove supplied libs.
-- Add GCJ AOT libraries.
-- Update to snapshot from cvs 2009-12-01.
-
-* Sun Nov 29 2009 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-3
-- Adapted to Fedora packaging standards in preparation for submission to
- RPM Fusion.
-
-* Tue Jan 8 2008 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-2
-- Escape dollar in here-script.
-- Use system version of libraries.
-
-* Sun Jan 6 2008 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-1
-- Initial build.
+%autochangelog
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..d3b4a1f
--- /dev/null
+++ b/changelog
@@ -0,0 +1,131 @@
+* Sat Aug 06 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.91.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
+ 5.1
+
+* Tue Feb 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.91.0-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Feb 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Sep 10 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.91.0-17
+- Fix appdata
+
+* Tue Sep 1 2020 Göran Uddeborg <goeran(a)uddeborg.se> 0.91.0-16
+- Remove inccorrectly commited source from git.
+
+* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.91.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Feb 28 2018 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.91.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Sep 19 2017 Göran Uddeborg <goeran(a)uddeborg.se> 0.91.0-9
+- Appdata added.
+
+* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.91.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Mar 18 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.91.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 25 2015 Göran Uddeborg <goeran(a)uddeborg.se> - 0.91.0-6
+- Use MMX instructions only on architectures that have them (BZ3549)
+
+* Fri Feb 13 2015 Göran Uddeborg <goeran(a)uddeborg.se> - 0.91.0-5
+- Build with fast-math (BZ3499)
+- Separate licence from documentation files
+- Skip obsolete defattr declaration
+- Include the release notes in the documentation
+- Use standard line endings in the documentation and license files
+- Fix some minor lint
+
+* Sat Oct 25 2014 Sérgio Basto <sergio(a)serjux.com> - 0.91.0-4
+- add %{?dist} tag
+
+* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.91.0-3
+- Mass rebuilt for Fedora 19 Features
+
+* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.91.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sun Jun 19 2011 Göran Uddeborg <goeran(a)uddeborg.se> - 0.91.0
+- New upstreams version. This is an official release, not a snapshot
+ any more.
+
+* Mon Jun 13 2011 Göran Uddeborg <goeran(a)uddeborg.se> - 0.90.4.00-10.20100806cvs
+- Adjust to updated packaging guidelines:
+- + Build wrapper script using the jpackage_script macro.
+- + Remove support for GCJ.
+
+* Fri Oct 15 2010 Göran Uddeborg <goeran(a)uddeborg.se> - 0.90.4.00-9.20100806cvs
+- jakarta-commons-net has been replaced with apache-commons-net. Requirements
+ updated.
+
+* Fri Oct 15 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 0.90.4.00-8.20100806cvs
+- Rebuilt for gcc bug
+
+* Tue Aug 10 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-7.20100806cvs
+- Remove the requirement on Java 1.6. GCJ (ECJ) is fine for bytecode
+ compilation.
+
+* Sat Aug 7 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-6.20100806cvs
+- Added version number to sysjava patch, indicating for which version it was
+ made.
+- Require Java 1.6, to get a newer compiler than GCJ's.
+- Omit "lib" subdirectory and other bits not needed on Linux from the archive.
+ Takes away the need to remove "lib" in "prep" section.
+- Compress the archive with xz rather than bzip2.
+- Update to snapshot from cvs 2010-08-06.
+- Made a separate patch file for the desktop file modifications.
+- Put the html help documentation in the jar archive, so it can be found in
+ installed mode.
+
+* Mon Aug 2 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-5.20100801cvs
+- Include the cvs date in the source package.
+- Explicitly prune empty directories when checking out from CVS.
+- Include a little script that creates the tar file.
+- Make the wrapper script a separate source file.
+- Changed BuildArchitectures tag to BuildArch.
+
+* Sun Aug 1 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-4.20100801cvs
+- Switch to single character spacing of sentences in the description.
+- Add comment on how to recreate the tar archive.
+- Update to snapshot from cvs 2010-08-01.
+- Do double line spacing between major sections.
+- Removed cleaning in install and clean sections, no longer needed from F13.
+
+* Mon Dec 7 2009 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-3.20091201cvs
+- BuildRequires entries on separate lines
+- Don't point out Europe in the description, DVB is used in more places.
+- Build wrapper script using jpackage-utils.
+- Add a desktop file.
+- Explicitly remove supplied libs.
+- Add GCJ AOT libraries.
+- Update to snapshot from cvs 2009-12-01.
+
+* Sun Nov 29 2009 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-3
+- Adapted to Fedora packaging standards in preparation for submission to
+ RPM Fusion.
+
+* Tue Jan 8 2008 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-2
+- Escape dollar in here-script.
+- Use system version of libraries.
+
+* Sun Jan 6 2008 Göran Uddeborg <goeran(a)uddeborg.se> 0.90.4.00-1
+- Initial build.
1 year, 6 months
[kodi-pvr-iptvsimple/f38] Update to 20.10.1 + fix RFBZ #6656
by Mohamed ElMorabity
commit 6726ddb84fbc8d8fa7ea0b34989118c0dca71037
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Fri May 19 17:42:11 2023 +0200
Update to 20.10.1 + fix RFBZ #6656
.gitignore | 1 +
kodi-pvr-iptvsimple.spec | 9 +++++++--
sources | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d8f84ae..e608ae8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/pvr.iptvsimple-20.7.0.tar.gz
/pvr.iptvsimple-20.8.0.tar.gz
/pvr.iptvsimple-20.9.1.tar.gz
+/pvr.iptvsimple-20.10.1.tar.gz
diff --git a/kodi-pvr-iptvsimple.spec b/kodi-pvr-iptvsimple.spec
index 9eafd75..fd7f5c9 100644
--- a/kodi-pvr-iptvsimple.spec
+++ b/kodi-pvr-iptvsimple.spec
@@ -6,7 +6,7 @@ Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
Epoch: 1
-Version: 20.9.1
+Version: 20.10.1
Release: 1%{?dist}
Summary: Simple IPTV PVR for Kodi
@@ -24,7 +24,8 @@ BuildRequires: pkgconfig(zlib)
BuildRequires: xz-devel
Requires: kodi >= %{kodi_version}
Requires: kodi-inputstream-adaptive%{?_isa} >= %{kodi_version}
-Requires: kodi-inputstream-ffmpegdirect%{?_isa} >= %{kodi_version}
+# TODO: uncomment once kodi-inputstream-ffmpegdirect is packaged (see RFBZ #6387)
+# Requires: kodi-inputstream-ffmpegdirect%%{?_isa} >= %%{kodi_version}
Requires: kodi-inputstream-rtmp%{?_isa} >= %{kodi_version}
ExcludeArch: %{power64}
@@ -61,6 +62,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.met
%changelog
+* Fri May 19 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:20.10.1-1
+- Update to 20.10.1
+- Fix Requires (RFBZ #6656)
+
* Mon Mar 27 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:20.9.1-1
- Update to 20.9.1
diff --git a/sources b/sources
index 2162132..bfbc27a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pvr.iptvsimple-20.9.1.tar.gz) = cca3e713631bb3bc37012914c178dff1b1f54c79638182491c17030e510619200972cd9d4d6c03b5c246029a9bd2a0760a29ac951bcc2d8c2081328e560bbdcb
+SHA512 (pvr.iptvsimple-20.10.1.tar.gz) = 174686be158cc6900d2465ac9523cc243633a010bdcd98c27eebb6d96e47a794450830975267ef9e5222399b976cc427b24af3004e248ece339532a0805b9d48
1 year, 6 months