[wiringpi] Replace Conflicts with Obsoletes/Provides Add armv7hnl to ExclusiveArch
by Andrew Bauer
commit 0e33aa3415f2b624453989e530363f55aaaaf5a6
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Tue Sep 3 07:17:30 2019 -0500
Replace Conflicts with Obsoletes/Provides
Add armv7hnl to ExclusiveArch
0001-Makefiles.patch | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
wiringpi.spec | 10 ++--
3 files changed, 136 insertions(+), 4 deletions(-)
---
diff --git a/0001-Makefiles.patch b/0001-Makefiles.patch
new file mode 100644
index 0000000..ff3648c
--- /dev/null
+++ b/0001-Makefiles.patch
@@ -0,0 +1,128 @@
+From ff57f26d13dd5bbd7c6b9b562fb16e07991d4ca0 Mon Sep 17 00:00:00 2001
+Message-Id: <ff57f26d13dd5bbd7c6b9b562fb16e07991d4ca0.1526287488.git.devel(a)agrez.net>
+From: Vaughan Agrez <devel(a)agrez.net>
+Date: Mon, 14 May 2018 16:44:42 +0800
+Subject: [PATCH] Update Makefiles for Fedora
+
+---
+ devLib/Makefile | 15 ++++++++++++++-
+ gpio/Makefile | 10 +++++++++-
+ wiringPi/Makefile | 13 +++++++++++++
+ 3 files changed, 36 insertions(+), 2 deletions(-)
+
+diff --git a/devLib/Makefile b/devLib/Makefile
+index cf665d6..d605c53 100644
+--- a/devLib/Makefile
++++ b/devLib/Makefile
+@@ -24,6 +24,8 @@
+ VERSION=$(shell cat ../VERSION)
+ DESTDIR?=/usr
+ PREFIX?=/local
++LIBDIR?=/usr/lib
++WIRINGPI_SONAME_SUFFIX=.$(shell printf "%.0f" "$(VERSION)")
+
+ LDCONFIG?=ldconfig
+
+@@ -37,7 +39,7 @@ DYNAMIC=libwiringPiDev.so.$(VERSION)
+ #DEBUG = -g -O0
+ DEBUG = -O2
+ CC = gcc
+-INCLUDE = -I.
++INCLUDE = -I. -I../wiringPi/
+ DEFS = -D_GNU_SOURCE
+ CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
+
+@@ -73,6 +75,7 @@ $(DYNAMIC): $(OBJ)
+ .c.o:
+ $Q echo [Compile] $<
+ $Q $(CC) -c $(CFLAGS) $< -o $@
++ @ln -sf libwiringPiDev.so.$(VERSION) libwiringPiDev.so
+
+ .PHONY: clean
+ clean:
+@@ -115,6 +118,16 @@ install-deb: $(DYNAMIC)
+ install -m 0755 libwiringPiDev.so.$(VERSION) ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)
+ ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION) ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so
+
++.PHONY: install-fedora
++install-fedora: $(DYNAMIC)
++ @echo "[Install Headers]"
++ @install -m 0755 -d $(DESTDIR)$(PREFIX)/include/wiringPi
++ @install -m 0644 $(HEADERS) $(DESTDIR)$(PREFIX)/include/wiringPi
++ @echo "[Install Dynamic Lib]"
++ @install -m 0755 -d $(DESTDIR)$(LIBDIR)
++ @install -m 0755 libwiringPiDev.so.$(VERSION) $(DESTDIR)$(LIBDIR)/libwiringPiDev.so.$(VERSION)
++ @ln -sf $(LIBDIR)/libwiringPiDev.so.$(VERSION) $(DESTDIR)$(LIBDIR)/libwiringPiDev.so$(WIRINGPI_SONAME_SUFFIX)
++
+ .PHONY: uninstall
+ uninstall:
+ $Q echo "[UnInstall]"
+diff --git a/gpio/Makefile b/gpio/Makefile
+index 9ec160d..1592b27 100644
+--- a/gpio/Makefile
++++ b/gpio/Makefile
+@@ -33,7 +33,7 @@ endif
+ #DEBUG = -g -O0
+ DEBUG = -O2
+ CC = gcc
+-INCLUDE = -I$(DESTDIR)$(PREFIX)/include
++INCLUDE = -I$(DESTDIR)$(PREFIX)/include -I../wiringPi -I../devLib
+ CFLAGS = $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
+
+ LDFLAGS = -L$(DESTDIR)$(PREFIX)/lib
+@@ -80,6 +80,14 @@ endif
+ $Q mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
+ $Q cp gpio.1 $(DESTDIR)$(PREFIX)/share/man/man1
+
++.PHONY: install-fedora
++install-fedora: gpio
++ @echo "[Install]"
++ @install -m 0755 -d $(DESTDIR)$(PREFIX)/bin
++ @install -m 0755 gpio $(DESTDIR)$(PREFIX)/bin
++ @mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
++ @install -m 0644 gpio.1 $(DESTDIR)$(PREFIX)/share/man/man1
++
+ .PHONY: install-deb
+ install-deb: gpio
+ $Q echo "[Install: deb]"
+diff --git a/wiringPi/Makefile b/wiringPi/Makefile
+index 287fa58..39532e4 100644
+--- a/wiringPi/Makefile
++++ b/wiringPi/Makefile
+@@ -24,6 +24,8 @@
+ VERSION=$(shell cat ../VERSION)
+ DESTDIR?=/usr
+ PREFIX?=/local
++LIBDIR?=/usr/lib
++WIRINGPI_SONAME_SUFFIX=.$(shell printf "%.0f" "$(VERSION)")
+
+ LDCONFIG?=ldconfig
+
+@@ -80,6 +82,7 @@ $(DYNAMIC): $(OBJ)
+ .c.o:
+ $Q echo [Compile] $<
+ $Q $(CC) -c $(CFLAGS) $< -o $@
++ @ln -sf libwiringPi.so.$(VERSION) libwiringPi.so
+
+
+ .PHONY: clean
+@@ -114,6 +117,16 @@ install-deb: $(DYNAMIC)
+ install -m 0755 libwiringPi.so.$(VERSION) ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION)
+ ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION) ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so
+
++.PHONY: install-fedora
++install-fedora: $(DYNAMIC)
++ @echo "[Install Headers]"
++ @install -m 0755 -d $(DESTDIR)$(PREFIX)/include/wiringPi
++ @install -m 0644 $(HEADERS) $(DESTDIR)$(PREFIX)/include/wiringPi
++ @echo "[Install Dynamic Lib]"
++ @install -m 0755 -d $(DESTDIR)$(LIBDIR)
++ @install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(LIBDIR)/libwiringPi.so.$(VERSION)
++ @ln -sf $(LIBDIR)/libwiringPi.so.$(VERSION) $(DESTDIR)$(LIBDIR)/libwiringPi.so$(WIRINGPI_SONAME_SUFFIX)
++
+ .PHONY: uninstall
+ uninstall:
+ $Q echo "[UnInstall]"
+--
+2.14.3
+
diff --git a/sources b/sources
index e409949..f433d10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-143cd906050429bc0839a8c97b523738 wiringPi-8d188fa.tar.gz
+f179b91d3e43807eeb5ae16e64eb3175 wiringPi-8d188fa.tar.gz
diff --git a/wiringpi.spec b/wiringpi.spec
index 9fc57be..6382259 100644
--- a/wiringpi.spec
+++ b/wiringpi.spec
@@ -3,21 +3,21 @@
Name: wiringpi
Version: 2.46
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: PIN based GPIO access library for BCM283x SoC devices
License: LGPLv3
URL: http://wiringpi.com
Source0: https://git.drogon.net/?p=wiringPi;a=snapshot;h=%{commit_long};sf=tgz#/wi...
Patch0: 0001-Makefiles.patch
-ExclusiveArch: armv7hl
+ExclusiveArch: armv7hl armv7hnl
BuildRequires: gcc
# wiringpi-libs pacakge exists in some third party repos
+# flag it as conflicting
Obsoletes: %{name}-libs < %{version}-%{release}
Provides: %{name}-libs = %{version}-%{release}
-
%description
WiringPi is a PIN based GPIO access library for the BCM2835, BCM2836 and
BCM2837 SoC devices (Raspberry Pi devices). It is usable from C,
@@ -128,6 +128,10 @@ done
%changelog
+* Mon Sep 02 2019 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 2.46-5
+- Replace Conflicts with Obsoletes/Provides
+- Add armv7hnl to ExclusiveArch
+
* Sat Nov 10 2018 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 2.46-4
- Refactor for RPM Fusion
- See RFBZ 5079
4 years, 7 months
[ndiswrapper-kmod/el7] Revert "readd patch"
by Leigh Scott
commit d86e7831b72f146dd2bab54b81fe74b4c0204f19
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Sep 3 10:31:25 2019 +0100
Revert "readd patch"
This reverts commit 0054de048ba30d362d2d2db9c1ed322583654f5f.
ndiswrapper-kmod.spec | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/ndiswrapper-kmod.spec b/ndiswrapper-kmod.spec
index d9f2a41..a1f4540 100644
--- a/ndiswrapper-kmod.spec
+++ b/ndiswrapper-kmod.spec
@@ -19,7 +19,6 @@ Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?pre}.tar.
Source11: ndiswrapper-kmodtool-excludekernel-filterfile
Patch0: ndiswrapper-kmod-nomodinfo.patch
Patch1: ndiswrapper-1.61-rhel.patch
-Patch2: ndiswrapper-4.7-kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -52,7 +51,6 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfi
(cd ndiswrapper-%{version}%{?pre} ;
%patch0 -p1 -b .orig
%patch1 -p1 -b .rhel
-%patch2 -p1 -b .4.7-kernel
)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?pre}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
4 years, 7 months
[ndiswrapper-kmod/el7] readd patch
by Leigh Scott
commit 0054de048ba30d362d2d2db9c1ed322583654f5f
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Sep 3 10:21:39 2019 +0100
readd patch
ndiswrapper-kmod.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/ndiswrapper-kmod.spec b/ndiswrapper-kmod.spec
index a1f4540..d9f2a41 100644
--- a/ndiswrapper-kmod.spec
+++ b/ndiswrapper-kmod.spec
@@ -19,6 +19,7 @@ Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?pre}.tar.
Source11: ndiswrapper-kmodtool-excludekernel-filterfile
Patch0: ndiswrapper-kmod-nomodinfo.patch
Patch1: ndiswrapper-1.61-rhel.patch
+Patch2: ndiswrapper-4.7-kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -51,6 +52,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfi
(cd ndiswrapper-%{version}%{?pre} ;
%patch0 -p1 -b .orig
%patch1 -p1 -b .rhel
+%patch2 -p1 -b .4.7-kernel
)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?pre}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
4 years, 7 months
[ndiswrapper-kmod/el7] Rebuild for new el7 kernel
by Leigh Scott
commit 80631b5cd66e10f9ada4bad2d43798ccf86067ec
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Sep 3 10:10:14 2019 +0100
Rebuild for new el7 kernel
ndiswrapper-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ndiswrapper-kmod.spec b/ndiswrapper-kmod.spec
index 158ce19..a1f4540 100644
--- a/ndiswrapper-kmod.spec
+++ b/ndiswrapper-kmod.spec
@@ -11,7 +11,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.61
-Release: 2%{?pre}%{?dist}
+Release: 3%{?pre}%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Sep 03 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1.61-3
+- Rebuild for new el7 kernel
+
* Wed Jul 05 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 1.61-2
- Add patch for rhel kernel
4 years, 7 months
[VirtualBox-kmod] Rebuild for new el7 kernel
by Leigh Scott
commit 55e5af272aadfee5cb5991baac35bedd1cc0781c
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Sep 3 09:47:14 2019 +0100
Rebuild for new el7 kernel
VirtualBox-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 8ed3785..0b7fee8 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -45,7 +45,7 @@
Name: VirtualBox-kmod
Version: 6.0.10
-Release: 3%{?dist}
+Release: 4%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -150,6 +150,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Tue Sep 03 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 6.0.10-4
+- Rebuild for new el7 kernel
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.0.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
4 years, 7 months
[kodi/f29] (4 commits) ...Update to 18.4, patch for Python 3 support (F32+ only)
by Michael Cronenworth
Summary of changes:
68b7ad3... Drop wiiremote man page if support is disabled (*)
8214806... Fix filename of manpage (*)
326d785... Rebuild for new ffmpeg version (*)
e74e460... Update to 18.4, patch for Python 3 support (F32+ only) (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 7 months
