Accepting request 267211 from home:posophe:branches:system:packagemanager

- Update to version 2.15.1
  + see  /usr/share/doc/packages/devscripts/changelog for details
- Upstream moved to python3
  + Use python3-{devel,setuptools} instead of python-{devel,setuptools}
  That means compatibility with SLE11 is broken
- Remove now unapplied patches
  + devscripts-pod2man-no-utf8.patch
  + devscripts-old-File-Path.patch
- Adapt devscripts-2.11.7-remove-install-layout-deb.patch to upstream
  changes > devscripts-2.15.1-remove-install-layout-deb.patch
- Remove yet obsolete compatibility stuff

OBS-URL: https://build.opensuse.org/request/show/267211
OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/devscripts?expand=0&rev=13

devscripts-2.15.1-remove-install-layout-deb.patch

@@ -1,12 +1,12 @@
 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
-@@ -76,7 +76,7 @@
+@@ -95,7 +95,7 @@
- 	$(foreach python,$(shell pyversions -r ../debian/control),$(python) setup.py test$(\n))
+ 	$(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n))
  
  install: all
--	python setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
+-	python3 setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
-+	python setup.py install --root="$(DESTDIR)" --no-compile --prefix=/usr
++	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

devscripts-old-File-Path.patch

@@ -1,47 +0,0 @@
-diff -ur devscripts-2.11.7.orig/scripts/chdist.pl devscripts-2.11.6/scripts/chdist.pl
---- devscripts-2.11.7.orig/scripts/chdist.pl	2011-09-26 10:38:05.000000000 +0200
-+++ devscripts-2.11.7/scripts/chdist.pl	2012-04-15 00:39:40.000000000 +0200
-@@ -130,7 +130,7 @@
- use warnings;
- use feature 'switch';
- use File::Copy qw(cp);
--use File::Path qw(make_path);
-+use File::Path qw(mkpath);
- use File::Basename;
- use Getopt::Long qw(:config gnu_compat bundling require_order);
- use Cwd qw(abs_path cwd);
-@@ -319,11 +319,11 @@
-     if (-d $dir) {
- 	fatal("$dir already exists, exiting.");
-     }
--    make_path($datadir);
-+    mkpath($datadir);
-     foreach my $d (('/etc/apt', '/etc/apt/apt.conf.d', '/etc/apt/preferences.d',
- 		    '/etc/apt/trusted.gpg.d', '/var/lib/apt/lists/partial',
- 		    '/var/cache/apt/archives/partial', '/var/lib/dpkg')) {
--	make_path("$dir/$d");
-+	mkpath("$dir/$d");
-     }
- 
-     # Create sources.list
-diff -ur devscripts-2.11.7.orig/scripts/debsnap.pl devscripts-2.11.6/scripts/debsnap.pl
---- devscripts-2.11.7.orig/scripts/debsnap.pl	2012-02-26 19:53:51.000000000 +0100
-+++ devscripts-2.11.7/scripts/debsnap.pl	2012-04-15 00:40:00.000000000 +0200
-@@ -21,7 +21,7 @@
- use Getopt::Long qw(:config gnu_getopt);
- use File::Basename;
- use Cwd qw/cwd abs_path/;
--use File::Path qw/make_path/;
-+use File::Path qw/mkpath/;
- use Dpkg::Version;
- 
- my $progname = basename($0);
-@@ -231,7 +231,7 @@
- 	fatal "Destination dir $opt{destdir} already exists.\nPlease (re)move it first, or use --force to overwrite.";
-     }
- }
--make_path($opt{destdir});
-+mkpath($opt{destdir});
- 
- my $json_text = fetch_json_page($baseurl);
- unless ($json_text && @{$json_text->{result}}) {

devscripts-pod2man-no-utf8.patch

@@ -1,12 +0,0 @@
-diff -ur devscripts-2.11.7.orig/scripts/Makefile devscripts-2.11.6/scripts/Makefile
---- devscripts-2.11.7.orig/scripts/Makefile	2012-04-28 20:50:58.885379591 +0200
-+++ devscripts-2.11.7/scripts/Makefile	2012-04-28 20:48:18.194956664 +0200
-@@ -42,7 +42,7 @@
- 
- %.1: %.pl
- 	podchecker $<
--	pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
-+	pod2man --center=" " --release="Debian Utilities" $< > $@
- %.1: %.dbk
- 	xsltproc --nonet -o $@ $(XSL_STYLESHEET) $<
- 

devscripts.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sun Jan  4 18:52:45 UTC 2015 - p.drouand@gmail.com
+
+- Update to version 2.15.1
+  + see  /usr/share/doc/packages/devscripts/changelog for details
+- Upstream moved to python3
+  + Use python3-{devel,setuptools} instead of python-{devel,setuptools}
+  That means compatibility with SLE11 is broken
+- Remove now unapplied patches
+  + devscripts-pod2man-no-utf8.patch
+  + devscripts-old-File-Path.patch
+- Adapt devscripts-2.11.7-remove-install-layout-deb.patch to upstream
+  changes > devscripts-2.15.1-remove-install-layout-deb.patch
+- Remove yet obsolete compatibility stuff
+
 -------------------------------------------------------------------
 Mon Jul  1 08:31:11 UTC 2013 - frank.lichtenheld@sophos.com
 

devscripts.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package devscripts
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,33 +16,22 @@
 #
 
 
-%{!?py_ver: %global py_ver %(echo `python -c "import sys; sys.stdout.write(sys.version[:3])"`)}
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
 Name:           devscripts
-Version:        2.12.6
+Version:        2.15.1
 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
 Group:          Development/Tools/Building
-Source0:        http://ftp.de.debian.org/debian/pool/main/d/devscripts/devscripts_%{version}.tar.gz
+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 --utf8 since we only build En manpages.
-Patch2:         devscripts-pod2man-no-utf8.patch
 # PATCH-FIX-UPSTREAM remove unrecognized --install-layout=deb from scripts/setup.py and fix prefix
-Patch3:         devscripts-2.11.7-remove-install-layout-deb.patch
+Patch3:         devscripts-2.15.1-remove-install-layout-deb.patch
-# PATCH-FIX-OPENSUSE support old versions of File::Patch (SLE 11)
-Patch4:         devscripts-old-File-Path.patch
-# PATCH-FIX-UPSTREAM fix_pod_syntax.patch asterios.dramis@gmail.com -- Fix pod syntax (fixes build with perl 5.18)
-Patch5:         fix_pod_syntax.patch
 BuildRequires:  dpkg-devel >= 1.15.6
-BuildRequires:  python-devel
+BuildRequires:  python3-devel
-# we are sorry to drop sles10 support, but no setuptools
+BuildRequires:  python3-setuptools
-BuildRequires:  python-setuptools
 BuildRequires:  zlib-devel
 Requires:       checkbashisms >= %{version}
 Requires:       dpkg
@@ -57,9 +46,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  sgmltool
 BuildRequires:  texlive-latex
 %define _xsl_stylesheet /usr/share/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl
-%if 0%{?suse_version} < 1120
-%define _libexecdir /usr/lib
-%endif
 %endif
 %if 0%{?fedora_version}
 BuildRequires:  tetex-latex
@@ -115,13 +101,8 @@ line, and outputs warnings if possible bashisms are detected.
 %setup -q
 
 %patch0 -p1
-%if 0%{?suse_version} && 0%{?suse_version} < 1130
-%patch2 -p1
-%patch4 -p1
-%endif
 %patch1 -p1
 %patch3 -p1
-%patch5 -p1
 
 %build
 make %{?_smp_mflags} XSL_STYLESHEET="%{_xsl_stylesheet}"
@@ -152,8 +133,8 @@ install -m644 debian/changelog %{buildroot}%{_docdir}/devscripts/changelog
 %doc %{_docdir}/devscripts
 %doc %{_mandir}/man*/*
 %{_bindir}/*
-%{python_sitelib}/devscripts/
+%{python3_sitelib}/devscripts/
-%{python_sitelib}/devscripts-%{version}-py%{py_ver}.egg-info/
+%{python3_sitelib}/devscripts-%{version}-py%{py3_ver}.egg-info/
 /usr/lib/devscripts
 %{_datadir}/devscripts
 %exclude %{_mandir}/man1/checkbashisms.1.gz

devscripts_2.12.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eab908dc6809459a62eac4e6d07bda714123fc4cc0b15e275b865c8a49e65f8e
-size 996395

devscripts_2.15.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a473e2e67a9afdf65e691dc69a9d52f8adc8c545e27b84605efdd6ebe452ac0
+size 608576

fix_pod_syntax.patch

@@ -1,18 +0,0 @@
-diff -Naur devscripts-2.12.4.orig/scripts/transition-check.pl devscripts-2.12.4/scripts/transition-check.pl
---- devscripts-2.12.4.orig/scripts/transition-check.pl	2012-09-25 01:51:39.000000000 +0300
-+++ devscripts-2.12.4/scripts/transition-check.pl	2013-06-29 23:31:50.225798441 +0300
-@@ -58,12 +58,12 @@
- 
- =over 4
- 
--=item 0
-+=item C<0>
- 
- Either B<--help> or B<--version> was used, or none of the packages examined
- was involved in a transition.
- 
--=item 1
-+=item C<1>
- 
- At least one package examined is involved in a current transition.
-