From bbee6e63f91f5a76bb216a263233bdd2412864ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 15 Jan 2014 13:48:11 +0200 Subject: [PATCH] new, version 2.13.9 based on fedora package ce3c0e9886d3e057c5ec26c8030b336ae1c18e4e --- devscripts.spec | 93 +++++++++++++++++++++++++++++++++ devscripts_docbook.patch | 33 ++++++++++++ devscripts_install-layout.patch | 12 +++++ devscripts_install-man.patch | 19 +++++++ 4 files changed, 157 insertions(+) create mode 100644 devscripts.spec create mode 100644 devscripts_docbook.patch create mode 100644 devscripts_install-layout.patch create mode 100644 devscripts_install-man.patch diff --git a/devscripts.spec b/devscripts.spec new file mode 100644 index 0000000..c7e7321 --- /dev/null +++ b/devscripts.spec @@ -0,0 +1,93 @@ +%include /usr/lib/rpm/macros.perl +Summary: Scripts for Debian Package maintainers +Name: devscripts +Version: 2.13.9 +Release: 0.1 +License: GPL v2+ +Group: Development +Source0: http://ftp.debian.org/debian/pool/main/d/devscripts/%{name}_%{version}.tar.xz +# Source0-md5: a55e715d41cd45c465fa937683e8e5dd +# Fixes path to xsl-stylesheet manpages docbook.xsl +Patch0: %{name}_docbook.patch +# Removes the debian-only --install-layout python-setuptools option +Patch1: %{name}_install-layout.patch +# Install some additional man pages +Patch2: %{name}_install-man.patch +URL: http://packages.debian.org/unstable/admin/devscripts +BuildRequires: docbook-style-xsl +BuildRequires: dpkg +BuildRequires: libxslt +BuildRequires: perl-DB_File +BuildRequires: perl-File-DesktopEntry +BuildRequires: perl-Parse-DebControl +BuildRequires: perl-base +BuildRequires: perl-libwww +BuildRequires: perl-modules +BuildRequires: po4a +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: tar >= 1:1.22 +BuildRequires: xz +# man for manpage-alert +Requires: %{_bindir}/man +Requires: checkbashisms = %{version}-%{release} +#Requires: dpkg-dev +Conflicts: rpmdevtools < 8.4 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Scripts to make the life of a Debian Package maintainer easier. + +%package -n checkbashisms +Summary: Check shell scripts for common bash-specific contructs + +%description -n checkbashisms +checkbashisms checks whether a /bin/sh script contains any common +bash-specific contructs. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +# Search for libvfork in %{_libdir}/%{name} +sed -i 's|%{_prefix}/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} \ + LIBDIR=%{_libdir}/%{name} \ + CFLAGS="$RPM_OPT_FLAGS" \ + LDFLAGS="$RPM_LD_FLAGS" + +%install +rm -rf $RPM_BUILD_ROOT +%make_install \ + LIBDIR=%{_libdir}/%{name} + +# Install docs through %doc +rm -rf $RPM_BUILD_ROOT%{_docdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README COPYING +%attr(755,root,root) %{_bindir}/* +%exclude %{_bindir}/checkbashisms +%{_mandir}/man1/* +%exclude %{_mandir}/man1/checkbashisms.1* +%{_libdir}/%{name} +%{py3_sitescriptdir}/%{name} +%{py3_sitescriptdir}/%{name}*.egg-info +%{_datadir}/%{name} + +%{_sysconfdir}/bash_completion.d/* + +%files -n checkbashisms +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/checkbashisms +%{_mandir}/man1/checkbashisms.1* diff --git a/devscripts_docbook.patch b/devscripts_docbook.patch new file mode 100644 index 0000000..027365b --- /dev/null +++ b/devscripts_docbook.patch @@ -0,0 +1,33 @@ +diff -rupN devscripts-2.13.3/po4a/Makefile devscripts-2.13.3-new/po4a/Makefile +--- devscripts-2.13.3/po4a/Makefile 2013-08-16 02:01:22.000000000 +0200 ++++ devscripts-2.13.3-new/po4a/Makefile 2013-09-19 18:03:22.092429895 +0200 +@@ -25,7 +25,7 @@ de/%.de.1: de/%.de.pl translate + pod2man --utf8 --center=" " --release="Debian-Hilfswerkzeuge" $< > $@ + de/%.de.1: de/%.de.dbk translate + xsltproc --nonet -o $@ \ +- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< ++ /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl $< + # xsltproc writes out to foo.1 even if you tell it to do otherwise, so we have + # to rename the file after it's generated + mv de/$*.1 $@ +@@ -35,7 +35,7 @@ fr/%.fr.1: fr/%.fr.pl translate + pod2man --utf8 --center=" " --release="Utilitaires Debian" $< > $@ + fr/%.fr.1: fr/%.fr.dbk translate + xsltproc --nonet -o $@ \ +- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< ++ /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl $< + # xsltproc writes out to foo.1 even if you tell it to do otherwise, so we have + # to rename the file after it's generated + mv fr/$*.1 $@ +diff -rupN devscripts-2.13.3/scripts/Makefile devscripts-2.13.3-new/scripts/Makefile +--- devscripts-2.13.3/scripts/Makefile 2013-08-16 02:01:22.000000000 +0200 ++++ devscripts-2.13.3-new/scripts/Makefile 2013-09-19 18:03:22.264433043 +0200 +@@ -61,7 +61,7 @@ endif + pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@ + %.1: %.dbk + xsltproc --nonet -o $@ \ +- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< ++ /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl $< + + # There is a slight chance this gets called twice, once here from here and once + # from ../po4a/Makefile. Treat files with care. diff --git a/devscripts_install-layout.patch b/devscripts_install-layout.patch new file mode 100644 index 0000000..b18fadf --- /dev/null +++ b/devscripts_install-layout.patch @@ -0,0 +1,12 @@ +diff -rupN devscripts-2.13.3/scripts/Makefile devscripts-2.13.3-new/scripts/Makefile +--- devscripts-2.13.3/scripts/Makefile 2013-08-16 02:01:22.000000000 +0200 ++++ devscripts-2.13.3-new/scripts/Makefile 2013-09-19 18:05:52.040168029 +0200 +@@ -92,7 +92,7 @@ test: + $(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n)) + + install: all +- python3 setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb ++ python3 setup.py install --root="$(DESTDIR)" --no-compile + install -dD $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) + cp $(SCRIPTS) $(DESTDIR)$(BINDIR) + ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch diff --git a/devscripts_install-man.patch b/devscripts_install-man.patch new file mode 100644 index 0000000..bbd9483 --- /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:21:02.612017885 +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 *.1 $(DESTDIR)$(MAN1DIR) + + .PHONY: test -- 2.44.0