From 2835190ce274c2b8f12ce106ec9dba1224a9a17c939ba9244b1ef74aa7ff5951 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 13 Mar 2019 06:41:52 +0000 Subject: [PATCH] Accepting request 662123 from home:XRevan86 - Update to version 2.18.10. OBS-URL: https://build.opensuse.org/request/show/662123 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/devscripts?expand=0&rev=16 --- devscripts-2.11.7-buildfix.patch | 80 --------- devscripts-2.11.7-debcommit-hg16.patch | 15 -- ...pts-2.15.1-remove-install-layout-deb.patch | 12 -- devscripts-debcommit-hg16.patch | 13 ++ devscripts-fix-build.patch | 54 ++++++ devscripts-fix-python-install-layout.patch | 11 ++ devscripts.changes | 17 +- devscripts.spec | 167 ++++++++---------- devscripts_2.15.1.tar.xz | 3 - devscripts_2.18.10.tar.xz | 3 + 10 files changed, 173 insertions(+), 202 deletions(-) delete mode 100644 devscripts-2.11.7-buildfix.patch delete mode 100644 devscripts-2.11.7-debcommit-hg16.patch delete mode 100644 devscripts-2.15.1-remove-install-layout-deb.patch create mode 100644 devscripts-debcommit-hg16.patch create mode 100644 devscripts-fix-build.patch create mode 100644 devscripts-fix-python-install-layout.patch delete mode 100644 devscripts_2.15.1.tar.xz create mode 100644 devscripts_2.18.10.tar.xz diff --git a/devscripts-2.11.7-buildfix.patch b/devscripts-2.11.7-buildfix.patch deleted file mode 100644 index b650bee..0000000 --- a/devscripts-2.11.7-buildfix.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -ur devscripts-2.11.7.orig/Makefile devscripts-2.11.7/Makefile ---- devscripts-2.11.7.orig/Makefile 2012-05-07 02:08:21.000000000 +0200 -+++ devscripts-2.11.7/Makefile 2012-06-27 01:25:57.172666259 +0200 -@@ -11,7 +11,7 @@ - DOCDIR ?= $(PREFIX)/share/doc/devscripts - MAN1DIR ?= $(PREFIX)/share/man/man1 - --all: version make_scripts $(EXAMPLES) translated_manpages -+all: version scripts $(EXAMPLES) - - version: - rm -f version -@@ -40,7 +40,7 @@ - install: all install_scripts - cp -a $(PERL_MODULES) $(DESTDIR)$(PERLMOD_DIR) - cp $(EXAMPLES) $(DESTDIR)$(EXAMPLES_DIR) -- install -D README $(DESTDIR)$(DOCDIR)/README -+ install -D -m644 README $(DESTDIR)$(DOCDIR)/README - install -dD $(DESTDIR)$(MAN1DIR) - cp doc/*.1 $(DESTDIR)$(MAN1DIR) - ln -sf edit-patch.1 $(DESTDIR)$(MAN1DIR)/add-patch.1 -diff -ur devscripts-2.11.7.orig/Makefile.common devscripts-2.11.7/Makefile.common ---- devscripts-2.11.7.orig/Makefile.common 2012-05-07 02:08:21.000000000 +0200 -+++ devscripts-2.11.7/Makefile.common 2012-06-27 01:25:57.173666386 +0200 -@@ -6,3 +6,4 @@ - PERLMOD_DIR = /usr/share/devscripts - EXAMPLES_DIR = /usr/share/devscripts - -+XSL_STYLESHEET = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl -diff -ur devscripts-2.11.7.orig/po4a/Makefile devscripts-2.11.7/po4a/Makefile ---- devscripts-2.11.7.orig/po4a/Makefile 2012-05-07 02:08:21.000000000 +0200 -+++ devscripts-2.11.7/po4a/Makefile 2012-06-27 01:25:57.175666640 +0200 -@@ -22,8 +22,7 @@ - podchecker $< - 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 $< -+ xsltproc --nonet -o $@ $(XSL_STYLESHEET) $< - # 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 -ur devscripts-2.11.7.orig/scripts/Makefile devscripts-2.11.7/scripts/Makefile ---- devscripts-2.11.7.orig/scripts/Makefile 2012-05-07 02:08:21.000000000 +0200 -+++ devscripts-2.11.7/scripts/Makefile 2012-06-27 01:26:52.589709476 +0200 -@@ -24,7 +24,7 @@ - LIBDIR = /usr/lib/devscripts - BIN_LIBDIR = /usr/lib/devscripts - --all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS) $(COMPLETION) -+all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS) - - $(VERSION_FILE): - $(MAKE) -C .. version -@@ -36,7 +36,6 @@ - bash -n $@ - %.tmp: %.pl $(VERSION_FILE) - sed -e "s/###VERSION###/$(VERSION)/" $< > $@ -- perl -I.. -c $@ - %: %.tmp - cp $< $@ - chmod +x $@ -@@ -45,8 +44,7 @@ - podchecker $< - pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@ - %.1: %.dbk -- xsltproc --nonet -o $@ \ -- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< -+ xsltproc --nonet -o $@ $(XSL_STYLESHEET) $< - - # There is a slight chance this gets called twice, once here from here and once - # from ../po4a/Makefile. Treat files with care. -@@ -82,7 +80,6 @@ - ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch - cp $(LIBS) $(DESTDIR)$(LIBDIR) - install -dD $(DESTDIR)/etc/bash_completion.d -- cp $(COMPLETION) $(DESTDIR)/etc/bash_completion.d - # Special treatment for debpkg - install -dD $(DESTDIR)$(PERLMOD_DIR) - mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(PERLMOD_DIR) diff --git a/devscripts-2.11.7-debcommit-hg16.patch b/devscripts-2.11.7-debcommit-hg16.patch deleted file mode 100644 index f9b254d..0000000 --- a/devscripts-2.11.7-debcommit-hg16.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: devscripts-2.11.7/scripts/debcommit.pl -=================================================================== ---- devscripts-2.11.7/scripts/debcommit.pl.orig 2011-02-19 17:23:31.000000000 +0100 -+++ devscripts-2.11.7/scripts/debcommit.pl 2011-03-16 09:47:07.033357951 +0100 -@@ -584,7 +584,9 @@ - else { - die "debcommit: unknown program $prog"; - } -- die "debcommit: commit failed\n" if (! $action_rc); -+ # mercurial 1.6 returns failure if nothing is to be committed -+ # but we still want to continue with tagging -+ die "debcommit: commit failed\n" if (! $action_rc) && (! $release); - } - - sub tag { diff --git a/devscripts-2.15.1-remove-install-layout-deb.patch b/devscripts-2.15.1-remove-install-layout-deb.patch deleted file mode 100644 index ca3d0d5..0000000 --- a/devscripts-2.15.1-remove-install-layout-deb.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN devscripts-2.11.7.orig/scripts/Makefile devscripts-2.11.7/scripts/Makefile ---- devscripts-2.11.7.orig/scripts/Makefile 2012-05-21 20:25:34.530645434 +0800 -+++ devscripts-2.11.7/scripts/Makefile 2012-05-21 20:25:52.685418466 +0800 -@@ -95,7 +95,7 @@ - $(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 --prefix=/usr - install -dD $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) - cp $(SCRIPTS) $(DESTDIR)$(BINDIR) - ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch diff --git a/devscripts-debcommit-hg16.patch b/devscripts-debcommit-hg16.patch new file mode 100644 index 0000000..e05e309 --- /dev/null +++ b/devscripts-debcommit-hg16.patch @@ -0,0 +1,13 @@ +--- a/scripts/debcommit.pl ++++ b/scripts/debcommit.pl +@@ -663,7 +663,9 @@ sub commit { + } else { + die "debcommit: unknown program $prog"; + } +- die "debcommit: commit failed\n" if (!$action_rc); ++ # mercurial 1.6 returns failure if nothing is to be committed ++ # but we still want to continue with tagging ++ die "debcommit: commit failed\n" if (!$action_rc) && (!$release); + } + + sub tag { diff --git a/devscripts-fix-build.patch b/devscripts-fix-build.patch new file mode 100644 index 0000000..9d9f616 --- /dev/null +++ b/devscripts-fix-build.patch @@ -0,0 +1,54 @@ +diff -paur a/Makefile b/Makefile +--- a/Makefile 2018-11-15 08:15:00.000000000 +0300 ++++ b/Makefile 2018-12-16 16:59:27.376872292 +0300 +@@ -4,7 +4,7 @@ include Makefile.common + + DESTDIR = + +-all: version doc make_scripts conf.default translated_manpages ++all: version doc conf.default + + version: + rm -f version +diff -paur a/Makefile.common b/Makefile.common +--- a/Makefile.common 2018-11-15 08:15:00.000000000 +0300 ++++ b/Makefile.common 2018-12-16 17:00:29.077661251 +0300 +@@ -13,3 +13,5 @@ PERLMOD_DIR = $(shell perl -MConfig -e ' + DATA_DIR = $(PREFIX)/share/devscripts + TEMPLATES_DIR = $(DATA_DIR)/templates + SYSCONFDIR = /etc ++ ++XSL_STYLESHEET = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl +Только в b: Makefile.common.orig +Только в b: Makefile.common.rej +Только в b: Makefile.orig +Только в b: Makefile.rej +diff -paur a/po4a/Makefile b/po4a/Makefile +--- a/po4a/Makefile 2018-11-15 08:15:00.000000000 +0300 ++++ b/po4a/Makefile 2018-12-16 16:57:58.863740489 +0300 +@@ -40,8 +40,7 @@ fr/%.fr.1: fr/%.fr.pod translate + podchecker $< + 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 $< ++ xsltproc --nonet -o $@ $(XSL_STYLESHEET) $< + # 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 $@ +Только в b/po4a: Makefile.orig +diff -paur a/scripts/Makefile b/scripts/Makefile +--- a/scripts/Makefile 2018-11-15 08:15:00.000000000 +0300 ++++ b/scripts/Makefile 2018-12-16 17:02:23.223120806 +0300 +@@ -81,8 +81,7 @@ endif + podchecker $< + pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@ + %.1: %.dbk +- xsltproc --nonet -o $@ \ +- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< ++ xsltproc --nonet -o $@ $(XSL_STYLESHEET) $< + + # Syntax checker + test_sh: $(SH_CHECKS) +Только в b/scripts: Makefile.orig +Только в b/scripts: Makefile.rej diff --git a/devscripts-fix-python-install-layout.patch b/devscripts-fix-python-install-layout.patch new file mode 100644 index 0000000..2e3c87c --- /dev/null +++ b/devscripts-fix-python-install-layout.patch @@ -0,0 +1,11 @@ +--- a/scripts/Makefile ++++ b/scripts/Makefile +@@ -121,7 +120,7 @@ clean: + test: test_pl test_sh test_py + + install: all +- python3 setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb ++ python3 setup.py install --root="$(DESTDIR)" --prefix="$(PREFIX)" --no-compile + cp $(SCRIPTS) $(DESTDIR)$(BINDIR) + ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch + install -d $(DESTDIR)$(COMPL_DIR) diff --git a/devscripts.changes b/devscripts.changes index 1acca11..2696107 100644 --- a/devscripts.changes +++ b/devscripts.changes @@ -1,5 +1,19 @@ ------------------------------------------------------------------- -Sun Jan 4 18:52:45 UTC 2015 - p.drouand@gmail.com +Sat Dec 15 13:47:09 UTC 2018 - Alexei Sorokin + +- Update to version 2.18.10: + * See /usr/share/doc/packages/devscripts/changelog +- Rebase and rename devscripts-2.11.7-buildfix.patch to + devscripts-fix-build.patch. +- Rebase and rename devscripts-2.15.1-remove-install-layout-deb.patch + to devscripts-fix-python-install-layout.patch. +- Rebase and rename devscripts-2.11.7-debcommit-hg16.patch to + devscripts-debcommit-hg16.patch (is it still relevant?). +- Kill support for ancient openSUSE and non-SUSE distributions. +- Spec clean-up. + +------------------------------------------------------------------- +Sun Jan 4 18:52:45 UTC 2015 - Denisart Benjamin - Update to version 2.15.1 + see /usr/share/doc/packages/devscripts/changelog for details @@ -895,4 +909,3 @@ Mon May 15 17:20:51 CEST 2000 - schwab@suse.de Wed May 3 17:15:12 CEST 2000 - cihlar@suse.cz - package created - version 1.4.0.35 (debhelper 1.1.24) - diff --git a/devscripts.spec b/devscripts.spec index 3e2e4b8..b7df1a0 100644 --- a/devscripts.spec +++ b/devscripts.spec @@ -1,7 +1,7 @@ # # spec file for package devscripts # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,137 +12,124 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define _xsl_stylesheet %{_datadir}/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl Name: devscripts -Version: 2.15.1 +Version: 2.18.10 Release: 0 Summary: Scripts to make the life of a Debian Package maintainer easier -License: GPL-2.0+ and GPL-2.0 and GPL-3.0+ and GPL-3.0 and Artistic-2.0 and GPL-1.0+ or Artistic-1.0 and SUSE-Public-Domain and ISC +License: GPL-2.0-or-later AND GPL-2.0-only AND GPL-3.0-or-later AND GPL-3.0-only AND Artistic-2.0 AND GPL-1.0-or-later OR Artistic-1.0 AND SUSE-Public-Domain AND ISC Group: Development/Tools/Building -Source0: http://ftp.de.debian.org/debian/pool/main/d/devscripts/%{name}_%{version}.tar.xz -# PATCH-FIX-UPSTREAM remove bash auto completion and fix docbook template directories path. -Patch0: devscripts-2.11.7-buildfix.patch -# PATCH-FIX-UPSTREAM hg can't commit empty, fix it. -Patch1: devscripts-2.11.7-debcommit-hg16.patch -# PATCH-FIX-UPSTREAM remove unrecognized --install-layout=deb from scripts/setup.py and fix prefix -Patch3: devscripts-2.15.1-remove-install-layout-deb.patch -BuildRequires: dpkg-devel >= 1.15.6 +URL: https://salsa.debian.org/debian/devscripts +Source: https://deb.debian.org/debian/pool/main/d/devscripts/%{name}_%{version}.tar.xz +# PATCH-FIX-OPENSUSE devscripts-fix-build.patch -- Fix docbook template directories path. +Patch0: devscripts-fix-build.patch +# PATCH-FIX-OPENSUSE devscripts-fix-python-install-layout.patch -- Remove Debian's --install-layout=deb from setup.py. +Patch1: devscripts-fix-python-install-layout.patch +# PATCH-FEATURE-OPENSUSE devscripts-debcommit-hg16.patch -- Mercurial cannot commit empty, fix it. +Patch2: devscripts-debcommit-hg16.patch +BuildRequires: bash-completion-devel +BuildRequires: docbook-xsl-stylesheets +BuildRequires: dpkg-devel >= 1.18.19 +BuildRequires: help2man +BuildRequires: libxslt +BuildRequires: perl +BuildRequires: perl-macros BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: sgmltool +BuildRequires: texlive-latex BuildRequires: zlib-devel Requires: checkbashisms >= %{version} Requires: dpkg Requires: html2text -Requires: perl Provides: deb:%{_bindir}/debchange -BuildRequires: docbook-xsl-stylesheets -BuildRequires: libxslt -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%if 0%{?suse_version} -BuildRequires: sgmltool -BuildRequires: texlive-latex -%define _xsl_stylesheet /usr/share/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl -%endif -%if 0%{?fedora_version} -BuildRequires: tetex-latex -%define _xsl_stylesheet /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl -%endif -%if 0%{?rhel_version} -BuildRequires: tetex-latex -%define _xsl_stylesheet /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl -%endif -%if 0%{?centos_version} -BuildRequires: tetex-latex -%define _xsl_stylesheet /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl -%endif +%{?perl_requires} %description Collection of scripts for working on Debian packages. + Examples: - - bts: a command-line tool for manipulating the Debian Bug - Tracking System - - dcontrol: remotely query package and source control files - for all Debian distributions - - debchange/dch: automagically add entries to - debian/changelog files - - debsign, debrsign: sign a .changes/.dsc pair without - needing any of the rest of the package to be present; - can sign the pair remotely or fetch the pair from a - remote machine for signing - - diff2patches: extract patches from a .diff.gz file - placing them under debian/ or, if present, debian/patches - - licensecheck: attempt to determine the license of source - files - - uscan: scan upstream sites for new releases of packages + - bts: A command-line tool for manipulating the Debian Bug + Tracking System. + - dcontrol: Remotely query package and source control files for + all Debian distributions. + - debchange/dch: Automagically add entries to debian/changelog + files. + - debsign, debrsign: Sign a .changes/.dsc pair without needing any + of the rest of the package to be present; can sign the pair + remotely or fetch the pair from a remote machine for signing. + - diff2patches: Extract patches from a .diff.gz file placing them + under debian/ or, if present, debian/patches. + - licensecheck: Attempt to determine the license of source files. + - uscan: Scan upstream sites for new releases of packages. %package -n checkbashisms -Summary: Tool for checking /bin/sh scripts for possible bashisms -License: GPL-2.0+ +Summary: Tool for checking /bin/sh scripts for possible bashisms +License: GPL-2.0-or-later Group: Development/Tools/Building -Provides: deb:/usr/bin/checkbashisms -Provides: devscripts:/usr/bin/checkbashisms -Requires: perl -%if 0%{?suse_version} && 0%{?suse_version} < 1120 -#for the benefit of SLE -%else +Provides: deb:%{_bindir}/checkbashisms +Provides: devscripts:%{_bindir}/checkbashisms BuildArch: noarch -%endif +%{?perl_requires} %description -n checkbashisms -checkbashisms performs basic checks on /bin/sh shell scripts for the possible -presence of bashisms. It takes the names of the shell scripts on the command -line, and outputs warnings if possible bashisms are detected. +checkbashisms performs basic checks on /bin/sh shell scripts for +the possible presence of bashisms. It takes the names of the shell +scripts on the command line, and outputs warnings if possible +bashisms are detected. %prep %setup -q - %patch0 -p1 %patch1 -p1 -%patch3 -p1 +%patch2 -p1 %build -make %{?_smp_mflags} XSL_STYLESHEET="%{_xsl_stylesheet}" +make %{?_smp_mflags} V=1 \ + XSL_STYLESHEET="%{_xsl_stylesheet}" %install -%{__make} install DESTDIR=%{?buildroot} XSL_STYLESHEET="%{_xsl_stylesheet}" +%make_install \ + XSL_STYLESHEET="%{_xsl_stylesheet}" + +mkdir -p %{buildroot}%{_mandir}/man1/ +install -Dpm 0644 scripts/*.1 -t %{buildroot}%{_mandir}/man1/ -install -d %{buildroot}%{_mandir}/man1/ -install -d %{buildroot}%{_mandir}/man5/ -install -m 644 scripts/*.1 %{buildroot}%{_mandir}/man1/ -install -m 644 scripts/*.5 %{buildroot}%{_mandir}/man5/ while read target link; do - if [ -d $(dirname "%{buildroot}$link") ]; then - ln -sf $target %{buildroot}$link - fi -done