From 119c5b301197ff284da8697b808c113104c0935d Mon Sep 17 00:00:00 2001 From: yafen Date: Fri, 27 Aug 2021 19:23:56 +0800 Subject: [PATCH] change package name(dev to devel) and installation directory of man files (cherry picked from commit a8beab8a75ef1b2a71092643da5fba9a50b72858) --- 09-filelayout.patch | 9 +++- pigpio.spec | 104 ++++++++++++++++++++------------------------ 2 files changed, 53 insertions(+), 60 deletions(-) diff --git a/09-filelayout.patch b/09-filelayout.patch index 0d902e3..f270f5c 100644 --- a/09-filelayout.patch +++ b/09-filelayout.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -33,7 +33,7 @@ LL2 = -L. -lpigpiod_if -pthread -lr +@@ -33,12 +33,12 @@ LL2 = -L. -lpigpiod_if -pthread -lrt LL3 = -L. -lpigpiod_if2 -pthread -lrt @@ -9,4 +9,9 @@ exec_prefix = $(prefix) bindir = $(exec_prefix)/bin includedir = $(prefix)/include - + libdir = $(prefix)/lib +-mandir = $(prefix)/man ++mandir = $(prefix)/share/man + + all: $(ALL) + diff --git a/pigpio.spec b/pigpio.spec index 4cdca28..3b275a5 100644 --- a/pigpio.spec +++ b/pigpio.spec @@ -1,16 +1,10 @@ -%global _lib_path /usr/lib -%global _include_path /usr/include -%global _bin_path /usr/bin -%global _man1_path /usr/man/man1 -%global _man3_path /usr/man/man3 -%global _opt_path /opt/pigpio/cgi -%global _doc_path /usr/share/doc +%global _lib_dir /usr/lib %global _service_path /usr/lib/systemd/system %global debug_package %{nil} Name: pigpio Version: 1.79 -Release: 1 +Release: 2 Summary: Raspberry Pi GPIO control transitional package License: Unlicense URL: https://github.com/joan2937/pigpio @@ -26,9 +20,9 @@ BuildRequires: python3 BuildRequires: python3-setuptools Requires: libpigpiod-if2-1 = %{version}-%{release} Requires: libpigpiod-if1 = %{version}-%{release} -Requires: libpigpiod-if-dev = %{version}-%{release} +Requires: libpigpiod-if-devel = %{version}-%{release} Requires: libpigpio1 = %{version}-%{release} -Requires: libpigpio-dev = %{version}-%{release} +Requires: libpigpio-devel = %{version}-%{release} Requires: pigpio-tools = %{version}-%{release} Requires: pigpiod = %{version}-%{release} Requires: python3-pigpio = %{version}-%{release} @@ -55,12 +49,12 @@ Provides: libpigpiod-if1 = %{version}-%{release} %description -n libpigpiod-if1 This package provides the deprecated libpigpiod_if client library -%package -n libpigpiod-if-dev +%package -n libpigpiod-if-devel Summary: Development headers for client libraries for Raspberry Pi GPIO control -Provides: libpigpiod-if-dev = %{version}-%{release} +Provides: libpigpiod-if-devel = %{version}-%{release} Requires: libpigpiod-if2-1 = %{version}-%{release} Requires: libpigpiod-if1 = %{version}-%{release} -%description -n libpigpiod-if-dev +%description -n libpigpiod-if-devel This package provides the development headers for the libpigpiod_if2 and libpigpiod_if client libraries. %package -n libpigpio1 @@ -69,11 +63,11 @@ Provides: libpigpio1 = %{version}-%{release} %description -n libpigpio1 This package provides the pigpio library used to access the GPIO directly. -%package -n libpigpio-dev +%package -n libpigpio-devel Summary: Client tools for Raspberry Pi GPIO control -Provides: libpigpio-dev = %{version}-%{release} +Provides: libpigpio-devel = %{version}-%{release} Requires: libpigpio1 = %{version}-%{release} -%description -n libpigpio-dev +%description -n libpigpio-devel This package provides the development headers for the pigpio library used to access the GPIO directly. %package -n pigpio-tools @@ -110,77 +104,71 @@ make %install mkdir -p %{buildroot}%{_service_path} -mkdir -p %{buildroot}%{_doc_path}/{pigpio,pigpiod,pigpio-tools,libpigpio-dev,libpigpio1,libpigpiod-if-dev,libpigpiod-if2-1,libpigpiod-if1,python3-pigpio} cd %{name}-%{version} make install DESTDIR=%{buildroot} install -p -m 644 util/pigpiod.service %{buildroot}%{_service_path} -install -p -m 644 UNLICENCE %{buildroot}%{_doc_path}/pigpio/ -install -p -m 644 UNLICENCE %{buildroot}%{_doc_path}/pigpiod/ -install -p -m 644 UNLICENCE %{buildroot}%{_doc_path}/pigpio-tools/ -install -p -m 644 UNLICENCE %{buildroot}%{_doc_path}/libpigpio-dev/ -install -p -m 644 UNLICENCE %{buildroot}%{_doc_path}/libpigpio1/ -install -p -m 644 UNLICENCE %{buildroot}%{_doc_path}/libpigpiod-if-dev/ -install -p -m 644 UNLICENCE %{buildroot}%{_doc_path}/libpigpiod-if2-1/ -install -p -m 644 UNLICENCE %{buildroot}%{_doc_path}/libpigpiod-if1/ -install -p -m 644 UNLICENCE %{buildroot}%{_doc_path}/python3-pigpio/ %files %defattr (-, root, root) -%doc -/usr/share/doc/pigpio/* -%exclude /usr/lib/python2* +%license %{name}-%{version}/UNLICENCE +%exclude %{_lib_dir}/python2* %files -n libpigpiod-if2-1 %defattr (-, root, root) -/usr/lib/libpigpiod_if2.so.1 -/usr/share/doc/libpigpiod-if2-1/* +%{_lib_dir}/libpigpiod_if2.so.1 +%license %{name}-%{version}/UNLICENCE %files -n libpigpiod-if1 %defattr (-, root, root) -/usr/lib/libpigpiod_if.so.1 -/usr/share/doc/libpigpiod-if1/* +%{_lib_dir}/libpigpiod_if.so.1 +%license %{name}-%{version}/UNLICENCE -%files -n libpigpiod-if-dev +%files -n libpigpiod-if-devel %defattr (-, root, root) -/usr/lib/libpigpiod_if*.so -/usr/include/pigpiod_if*.h -/usr/man/man3/pigpiod_if.3* -/usr/man/man3/pigpiod_if2.3* -/usr/share/doc/libpigpiod-if-dev/* +%{_lib_dir}/libpigpiod_if*.so +%{_includedir}/pigpiod_if*.h +%{_mandir}/man3/pigpiod_if.3* +%{_mandir}/man3/pigpiod_if2.3* +%license %{name}-%{version}/UNLICENCE %files -n libpigpio1 %defattr (-, root, root) -/usr/lib/libpigpio.so.1 -/usr/share/doc/libpigpio1/* +%{_lib_dir}/libpigpio.so.1 +%license %{name}-%{version}/UNLICENCE -%files -n libpigpio-dev +%files -n libpigpio-devel %defattr (-, root, root) -/usr/lib/libpigpio.so -/usr/include/pigpio.h -/usr/man/man3/pigpio.3* -/usr/share/doc/libpigpio-dev/* +%{_lib_dir}/libpigpio.so +%{_includedir}/pigpio.h +%{_mandir}/man3/pigpio.3* +%license %{name}-%{version}/UNLICENCE %files -n pigpio-tools %defattr (-, root, root) -/usr/bin/pig2vcd -/usr/bin/pigs -/usr/man/man1/pigs.1* -/usr/man/man1/pig2vcd.1* -/usr/share/doc/pigpio-tools/* +%{_bindir}/pig2vcd +%{_bindir}/pigs +%{_mandir}/man1/pigs.1* +%{_mandir}/man1/pig2vcd.1* +%license %{name}-%{version}/UNLICENCE %files -n pigpiod %defattr (-, root, root) -/opt/pigpio/* -/usr/bin/pigpiod -/usr/man/man1/pigpiod.1* -/usr/lib/systemd/system/pigpiod.service -/usr/share/doc/pigpiod/* +/opt/pigpio +%{_bindir}/pigpiod +%{_mandir}/man1/pigpiod.1* +%{_service_path}/pigpiod.service +%license %{name}-%{version}/UNLICENCE %files -n python3-pigpio %defattr (-, root, root) -/usr/lib/python3* -/usr/share/doc/python3-pigpio/* +%{_lib_dir}/python3* +%license %{name}-%{version}/UNLICENCE %changelog +* Fri Aug 27 2021 Yafen Fang - 1.79-2 +- change package name libpigpiod-if-dev to libpigpiod-if-devel +- change package name libpigpio-dev to libpigpio-devel +- change installation directory of man files + * Mon May 17 2021 Yafen Fang - 1.79-1 - init package \ No newline at end of file