From 25063b165c551f9bcdac324dda6fdf825df5e39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Lepp=C3=A4nen?= Date: Wed, 16 Jan 2019 09:48:28 +0200 Subject: [PATCH] =?UTF-8?q?[packaging]=C2=A0Move=20man=20page=20to=20usb-m?= =?UTF-8?q?oded-doc.=20Contributes=20to=20JB#24119?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move man page from usb-moded to doc subpackage. Rename documentation directory for better consistency with other -doc packages. Remove old debian files that are not needed. Include license file in main package. Fix bogus date in changes. Signed-off-by: Tomi Leppänen --- rpm/usb-moded.changes | 2 +- rpm/usb-moded.spec | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/rpm/usb-moded.changes b/rpm/usb-moded.changes index 965bc15..fc22790 100644 --- a/rpm/usb-moded.changes +++ b/rpm/usb-moded.changes @@ -16,7 +16,7 @@ - Add rescue mode - Add softconnect support -* Thu Nov 20 2012 Philippe De Swert - 0.54.1 +* Tue Nov 20 2012 Philippe De Swert - 0.54.1 - Fix configuration file creation when the /etc/usb-moded dir is missing * Mon Nov 19 2012 Philippe De Swert - 0.54 diff --git a/rpm/usb-moded.spec b/rpm/usb-moded.spec index ff4a44b..f8b0c41 100644 --- a/rpm/usb-moded.spec +++ b/rpm/usb-moded.spec @@ -337,9 +337,9 @@ install -m 644 -D src/usb_moded-modes.h %{buildroot}/%{_includedir}/%{name}/usb_ install -m 644 -D src/usb_moded-appsync-dbus.h %{buildroot}/%{_includedir}/%{name}/usb_moded-appsync-dbus.h install -m 644 -D src/com.meego.usb_moded.xml %{buildroot}/%{_includedir}/%{name}/com.meego.usb_moded.xml install -m 644 -D usb_moded.pc %{buildroot}/%{_libdir}/pkgconfig/usb_moded.pc -install -d %{buildroot}/%{_docdir}/%{name}/html/ -install -m 644 docs/html/* %{buildroot}/%{_docdir}/%{name}/html/ -install -m 644 docs/usb_moded-doc.txt %{buildroot}/%{_docdir}/%{name}/ +install -d %{buildroot}/%{_docdir}/%{name}-%{version}/html/ +install -m 644 docs/html/* %{buildroot}/%{_docdir}/%{name}-%{version}/html/ +install -m 644 docs/usb_moded-doc.txt %{buildroot}/%{_docdir}/%{name}-%{version}/ install -m 644 -D debian/manpage.1 %{buildroot}/%{_mandir}/man1/usb-moded.1 install -m 644 -D debian/usb_moded.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/usb_moded.conf install -m 644 -D %{SOURCE1} %{buildroot}/%{_sysconfdir}/modprobe.d/usb_moded.conf @@ -378,7 +378,7 @@ systemctl daemon-reload || : %files %defattr(-,root,root,-) -%doc debian/copyright +%license LICENSE %dir %{_sysconfdir}/usb-moded %dir %{_sysconfdir}/usb-moded/dyn-modes %dir %{_sysconfdir}/usb-moded/run @@ -388,22 +388,19 @@ systemctl daemon-reload || : %ghost %{_sysconfdir}/udhcpd.conf %{_sbindir}/usb_moded %{_sbindir}/usb_moded_util -%{_mandir}/man1/usb-moded.1.gz /lib/systemd/system/%{name}.service /lib/systemd/system/basic.target.wants/%{name}.service %config %{_sysconfdir}/tmpfiles.d/usb-moded.conf %files devel %defattr(-,root,root,-) -%doc debian/copyright %{_includedir}/%{name}/* %{_libdir}/pkgconfig/usb_moded.pc %files doc %defattr(-,root,root,-) -%doc debian/changelog debian/copyright LICENSE -%{_docdir}/%{name}/* -%{_docdir}/%{name}/html/* +%{_docdir}/%{name}-%{version} +%{_mandir}/man1/usb-moded.1.gz %files developer-mode %defattr(-,root,root,-)