commit 0e33aa3415f2b624453989e530363f55aaaaf5a6 Author: Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; 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&gt; +From: Vaughan Agrez <devel(a)agrez.net&gt; +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&gt; - 2.46-5 +- Replace Conflicts with Obsoletes/Provides +- Add armv7hnl to ExclusiveArch + * Sat Nov 10 2018 Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; - 2.46-4 - Refactor for RPM Fusion - See RFBZ 5079