[devscripts] Split off licensecheck package, install additional manpages

Sandro Mani smani at fedoraproject.org
Thu Oct 17 15:14:34 UTC 2013


commit e1d8d28cc2a2c4ccbb78375359e90610c13b3196
Author: Sandro Mani <manisandro at gmail.com>
Date:   Thu Oct 17 17:14:29 2013 +0200

    Split off licensecheck package, install additional manpages

 devscripts.spec              |   28 +++++++++++++++++++++++++++-
 devscripts_install-man.patch |   19 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/devscripts.spec b/devscripts.spec
index c823336..b26528d 100644
--- a/devscripts.spec
+++ b/devscripts.spec
@@ -1,6 +1,6 @@
 Name:           devscripts
 Version:        2.13.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Scripts for Debian Package maintainers
 
 License:        GPLv2+
@@ -10,6 +10,8 @@ Source0:        http://ftp.debian.org/debian/pool/main/d/%{name}/%{name}_%{versi
 Patch0:         devscripts_docbook.patch
 # Removes the debian-only --install-layout python-setuptools option
 Patch1:         devscripts_install-layout.patch
+# Install some additional man pages
+Patch2:         devscripts_install-man.patch
 
 # rpmdevtools < 8.4 bundled some of the scripts provided by this package
 Conflicts:      rpmdevtools < 8.4
@@ -31,17 +33,31 @@ Requires:       dpkg-dev
 # man for manpage-alert
 Requires:       %{_bindir}/man
 
+Requires: %{name}-licensecheck
+
+
 %description
 Scripts to make the life of a Debian Package maintainer easier.
 
+
+%package licensecheck
+Summary:        The licensecheck script part of devscripts
+
+%description licensecheck
+The licensecheck script part of devscripts, split off to a subpackage to reduce
+dependencies.
+
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Search for libvfork in %%{_libdir}/%%{name}
 sed -i 's|/usr/lib/devscripts/libvfork.so.0|%{_libdir}/%{name}/libvfork.so.0|g' scripts/dpkg-depcheck.pl
 
+
 %build
 # LIBDIR determines where libvfork gets installed, see scripts/Makefile for LIBDIR
 make %{?_smp_mflags} LIBDIR=%{_libdir}/%{name}
@@ -63,9 +79,19 @@ rm -rf %{buildroot}%{_datadir}/doc
 %{python3_sitelib}/%{name}*.egg-info/
 %{_datadir}/%{name}/
 %{_mandir}/man1/*
+%exclude %{_bindir}/licensecheck
+%exclude %{_mandir}/man1/licensecheck.1*
 
+%files licensecheck
+%doc COPYING
+%{_bindir}/licensecheck
+%{_mandir}/man1/licensecheck.1*
 
 %changelog
+* Thu Oct 17 2013 Sandro Mani <manisandro at gmail.com> - 2.13.4-3
+- Split off licensecheck into a subpackage
+- Install some additional manpages
+
 * Mon Oct  7 2013 Ville Skyttä <ville.skytta at iki.fi> - 2.13.4-2
 - Add dependency on man for manpage-alert.
 
diff --git a/devscripts_install-man.patch b/devscripts_install-man.patch
new file mode 100644
index 0000000..b4ec774
--- /dev/null
+++ b/devscripts_install-man.patch
@@ -0,0 +1,19 @@
+diff -rupN devscripts-2.13.4/scripts/Makefile devscripts-2.13.4-new/scripts/Makefile
+--- devscripts-2.13.4/scripts/Makefile	2013-09-20 00:55:41.000000000 +0200
++++ devscripts-2.13.4-new/scripts/Makefile	2013-10-17 17:01:03.122445501 +0200
+@@ -27,6 +27,7 @@ GEN_MAN1S += devscripts.1
+ BINDIR = /usr/bin
+ LIBDIR = /usr/lib/devscripts
+ BIN_LIBDIR = /usr/lib/devscripts
++MAN1DIR = /usr/share/man/man1
+ 
+ all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS) $(COMPLETION)
+ 
+@@ -103,5 +104,7 @@ install: all
+ 	install -dD $(DESTDIR)$(PERLMOD_DIR)
+ 	mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(PERLMOD_DIR)
+ 	cp debpkg-wrapper $(DESTDIR)$(BINDIR)/debpkg
++	install -dD $(DESTDIR)$(MAN1DIR)
++	cp $(GEN_MAN1S) $(DESTDIR)$(MAN1DIR)
+ 
+ .PHONY: test


More information about the scm-commits mailing list