Hello community,
here is the log from the commit of package rpmdevtools for openSUSE:Factory checked in at 2017-05-31 12:18:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpmdevtools (Old)
and /work/SRC/openSUSE:Factory/.rpmdevtools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmdevtools"
Wed May 31 12:18:26 2017 rev:2 rq:498783 version:8.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpmdevtools/rpmdevtools.changes 2017-01-25 23:24:49.493302065 +0100
+++ /work/SRC/openSUSE:Factory/.rpmdevtools.new/rpmdevtools.changes 2017-05-31 12:19:32.302126777 +0200
@@ -1,0 +2,18 @@
+Sat May 27 13:28:13 UTC 2017 - aloisio@gmx.com
+
+- Update to version 8.10
+ * Extract (only) full name from gecos field in -packager
+ (rh#1350928)
+ * Point URLs to pagure.io
+
+- Updated source and homepage URLs
+
+- Dropped rmdevelrpms-8.5-SLE11.patch (target no longer built
+ in project)
+
+- Polished suse-specfile.patch, split off the python template
+ as suse-specfile_python.patch and
+ suse-specfile_python_single.patch and applied each depending on
+ the availability of python-rpm-macros
+
+-------------------------------------------------------------------
Old:
----
rmdevelrpms-8.5-SLE11.patch
rpmdevtools-8.9.tar.xz
New:
----
rpmdevtools-8.10.tar.xz
suse-specfile_python.patch
suse-specfile_python_single.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpmdevtools.spec ++++++
--- /var/tmp/diff_new_pack.rcyEjN/_old 2017-05-31 12:19:32.878045477 +0200
+++ /var/tmp/diff_new_pack.rcyEjN/_new 2017-05-31 12:19:32.878045477 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rpmdevtools
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -18,20 +18,23 @@
%define emacs_sitestart_d %{_datadir}/emacs/site-lisp
Name: rpmdevtools
-Version: 8.9
+Version: 8.10
Release: 0
Summary: RPM Development Tools
# rpmdev-setuptree is GPL-2.0, everything else GPL-2.0+
License: GPL-2.0 and GPL-2.0+
Group: Development/Tools/Other
-Url: https://fedorahosted.org/rpmdevtools/
-Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz
+Url: https://pagure.io/rpmdevtools
+Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz
Source1: skeleton
Source2: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE suse-specfile.patch -- Apply fix to comply to http://en.opensuse.org/openSUSE:Specfile_guidelines
Patch0: suse-specfile.patch
Patch1: dont-drop-Groups.patch
-Patch2: rmdevelrpms-8.5-SLE11.patch
+# PATCH-FIX-OPENSUSE suse-specfile_python.patch -- Use old style python template
+Patch3: suse-specfile_python.patch
+# PATCH-FIX-OPENSUSE suse-specfile_python_single.patch -- Use new style python template (singlespec)
+Patch4: suse-specfile_python_single.patch
BuildRequires: help2man
BuildRequires: rpm-python
BuildRequires: xz
@@ -71,8 +74,10 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%if 0%{?suse_version} == 1110
-%patch2
+%if 0%{?suse_version} == 1315 && 0%{?sle_version} <= 120200
+%patch3 -p1
+%else
+%patch4 -p1
%endif
cp -a %{SOURCE1} template.init
@@ -88,7 +93,7 @@
mkdir -p %{buildroot}%{emacs_sitestart_d}
ln -s %{_datadir}/rpmdevtools/rpmdev-init.el %{buildroot}%{emacs_sitestart_d}/rpmdev-init.el
-#/bin/touch %{buildroot}%{emacs_sitestart_d}/rpmdev-init.elc
+#/bin/touch %%{buildroot}%%{emacs_sitestart_d}/rpmdev-init.elc
# Use the "rpmdev-" prefix for spectool that conflicts with Redhat spectool
mv %{buildroot}%{_bindir}/spectool %{buildroot}%{_bindir}/rpmdev-spectool
++++++ rpmdevtools-8.9.tar.xz -> rpmdevtools-8.10.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/Makefile.am new/rpmdevtools-8.10/Makefile.am
--- old/rpmdevtools-8.9/Makefile.am 2016-06-23 19:31:58.000000000 +0200
+++ new/rpmdevtools-8.10/Makefile.am 2017-01-14 11:51:20.000000000 +0100
@@ -74,3 +74,22 @@
flake8: $(python_scripts)
$(flake8) $(python_scripts)
+
+shell_scripts = rpmdev-diff rpmdev-extract rpmdev-md5 rpmdev-newinit \
+ rpmdev-newspec rpmdev-packager rpmdev-setuptree rpmdev-wipetree \
+ rpminfo rpmls template.init
+bashate = bashate
+shellcheck = shellcheck
+
+bashate: $(shell_scripts)
+ $(bashate) $(shell_scripts)
+
+shellcheck: $(shell_scripts)
+ $(shellcheck) $(shell_scripts)
+
+check-local: $(shell_scripts)
+ ret=0
+ for file in $(shell_scripts) ; do \
+ bash -n -O extglob $$file || ret=$$? ; \
+ done ; \
+ exit $$ret
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/Makefile.in new/rpmdevtools-8.10/Makefile.in
--- old/rpmdevtools-8.9/Makefile.in 2016-06-25 14:47:15.000000000 +0200
+++ new/rpmdevtools-8.10/Makefile.in 2017-01-14 12:32:14.000000000 +0100
@@ -344,6 +344,12 @@
rpmdev-sort rpmdev-vercmp
flake8 = flake8
+shell_scripts = rpmdev-diff rpmdev-extract rpmdev-md5 rpmdev-newinit \
+ rpmdev-newspec rpmdev-packager rpmdev-setuptree rpmdev-wipetree \
+ rpminfo rpmls template.init
+
+bashate = bashate
+shellcheck = shellcheck
all: all-recursive
.SUFFIXES:
@@ -746,7 +752,7 @@
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
@@ -771,7 +777,7 @@
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -789,7 +795,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -799,7 +805,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -869,6 +875,7 @@
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-local
check: check-recursive
all-am: Makefile $(SCRIPTS) $(MANS) $(DATA)
installdirs: installdirs-recursive
@@ -985,18 +992,18 @@
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
uninstall-man: uninstall-man1 uninstall-man8
-.MAKE: $(am__recursive_targets) install-am install-data-am \
+.MAKE: $(am__recursive_targets) check-am install-am install-data-am \
install-exec-am install-strip uninstall-am
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--refresh check check-am clean clean-cscope clean-generic \
- cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
- dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
- distcheck distclean distclean-generic distclean-tags \
- distcleancheck distdir distuninstallcheck dvi dvi-am html \
- html-am info info-am install install-am install-bashcompDATA \
- install-binSCRIPTS install-data install-data-am \
- install-data-hook install-dist_binSCRIPTS \
+ am--refresh check check-am check-local clean clean-cscope \
+ clean-generic cscope cscopelist-am ctags ctags-am dist \
+ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+ dist-xz dist-zip distcheck distclean distclean-generic \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-bashcompDATA install-binSCRIPTS install-data \
+ install-data-am install-data-hook install-dist_binSCRIPTS \
install-dist_pkgsysconfDATA install-dvi install-dvi-am \
install-exec install-exec-am install-exec-hook install-html \
install-html-am install-info install-info-am install-man \
@@ -1051,6 +1058,19 @@
flake8: $(python_scripts)
$(flake8) $(python_scripts)
+bashate: $(shell_scripts)
+ $(bashate) $(shell_scripts)
+
+shellcheck: $(shell_scripts)
+ $(shellcheck) $(shell_scripts)
+
+check-local: $(shell_scripts)
+ ret=0
+ for file in $(shell_scripts) ; do \
+ bash -n -O extglob $$file || ret=$$? ; \
+ done ; \
+ exit $$ret
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/NEWS new/rpmdevtools-8.10/NEWS
--- old/rpmdevtools-8.9/NEWS 2016-06-25 14:46:30.000000000 +0200
+++ new/rpmdevtools-8.10/NEWS 2017-01-14 12:31:10.000000000 +0100
@@ -1,3 +1,9 @@
+rpmdevtools 8.10 (2017-01-14)
+
+ Ville Skyttä:
+ - Extract (only) full name from gecos field in -packager (#1350928)
+ - Point URLs to pagure.io
+
rpmdevtools 8.9 (2016-06-25)
Ville Skyttä:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/aclocal.m4 new/rpmdevtools-8.10/aclocal.m4
--- old/rpmdevtools-8.9/aclocal.m4 2016-06-25 14:47:13.000000000 +0200
+++ new/rpmdevtools-8.10/aclocal.m4 2017-01-14 12:32:14.000000000 +0100
@@ -20,32 +20,63 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29.1)
+dnl
+dnl Copyright © 2004 Scott James Remnant .
+dnl Copyright © 2012-2015 Dan Nicholson
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -67,18 +98,19 @@
PKG_CONFIG=""
fi
fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
@@ -88,8 +120,10 @@
$3])dnl
fi])
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
m4_define([_PKG_CONFIG],
[if test -n "$$1"; then
pkg_cv_[]$1="$$1"
@@ -101,10 +135,11 @@
else
pkg_failed=untried
fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -112,19 +147,17 @@
else
_pkg_short_errors_supported=no
fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -178,16 +211,40 @@
AC_MSG_RESULT([yes])
$3
fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
AC_DEFUN([PKG_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -198,16 +255,18 @@
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -218,13 +277,15 @@
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
AC_DEFUN([PKG_CHECK_VAR],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -233,7 +294,7 @@
AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/configure new/rpmdevtools-8.10/configure
--- old/rpmdevtools-8.9/configure 2016-06-25 14:47:14.000000000 +0200
+++ new/rpmdevtools-8.10/configure 2017-01-14 12:32:14.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for rpmdevtools 8.9.
+# Generated by GNU Autoconf 2.69 for rpmdevtools 8.10.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
# Identity of this package.
PACKAGE_NAME='rpmdevtools'
PACKAGE_TARNAME='rpmdevtools'
-PACKAGE_VERSION='8.9'
-PACKAGE_STRING='rpmdevtools 8.9'
+PACKAGE_VERSION='8.10'
+PACKAGE_STRING='rpmdevtools 8.10'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1210,7 +1210,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures rpmdevtools 8.9 to adapt to many kinds of systems.
+\`configure' configures rpmdevtools 8.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1276,7 +1276,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rpmdevtools 8.9:";;
+ short | recursive ) echo "Configuration of rpmdevtools 8.10:";;
esac
cat <<\_ACEOF
@@ -1362,7 +1362,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-rpmdevtools configure 8.9
+rpmdevtools configure 8.10
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1379,7 +1379,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by rpmdevtools $as_me 8.9, which was
+It was created by rpmdevtools $as_me 8.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2242,7 +2242,7 @@
# Define the identity of the package.
PACKAGE='rpmdevtools'
- VERSION='8.9'
+ VERSION='8.10'
cat >>confdefs.h <<_ACEOF
@@ -3206,7 +3206,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by rpmdevtools $as_me 8.9, which was
+This file was extended by rpmdevtools $as_me 8.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3259,7 +3259,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-rpmdevtools config.status 8.9
+rpmdevtools config.status 8.10
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/configure.ac new/rpmdevtools-8.10/configure.ac
--- old/rpmdevtools-8.9/configure.ac 2016-06-25 14:46:35.000000000 +0200
+++ new/rpmdevtools-8.10/configure.ac 2017-01-14 12:30:56.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT(rpmdevtools, 8.9)
+AC_INIT(rpmdevtools, 8.10)
AM_INIT_AUTOMAKE([foreign 1.11 dist-xz no-dist-gzip
-Wall -Wno-portability -Werror])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/rpmdev-diff new/rpmdevtools-8.10/rpmdev-diff
--- old/rpmdevtools-8.9/rpmdev-diff 2011-10-30 13:36:45.000000000 +0100
+++ new/rpmdevtools-8.10/rpmdev-diff 2017-01-14 11:51:20.000000000 +0100
@@ -180,26 +180,26 @@
# Did the archives uncompress into base dirs?
if [[ $(ls -1d old/* | wc -l) -eq 1 ]] ; then
- old=$(ls -1d old/*)
+ old=$(ls -1d old/*)
else
- old=old
+ old=old
fi
if [[ $(ls -1d new/* | wc -l) -eq 1 ]] ; then
- new=$(ls -1d new/*)
+ new=$(ls -1d new/*)
else
- new=new
+ new=new
fi
# Fixup base dirs to the same level.
if [[ $(basename "$old") != $(basename "$new") ]] ; then
- if [[ $old != old ]] ; then
- mv "$old" .
- old=`basename "$old"`
- fi
- if [[ $new != new ]] ; then
- mv "$new" .
- new=`basename "$new"`
- fi
+ if [[ $old != old ]] ; then
+ mv "$old" .
+ old=`basename "$old"`
+ fi
+ if [[ $new != new ]] ; then
+ mv "$new" .
+ new=`basename "$new"`
+ fi
fi
# Contents mode is the default.
@@ -234,11 +234,11 @@
find "$old" -ls | \
perl -pe "s|^(?:[\d\s]*)(\S+)(?:\s+\d+)(.+)$|\1\2| ;
s|.*\s\Q$old\E$|| ; s|(\s)\Q$old/\E|\1|" | \
- sort > "$old.files"
+ sort > "$old.files"
find "$new" -ls | \
perl -pe "s|^(?:[\d\s]*)(\S+)(?:\s+\d+)(.+)$|\1\2| ;
s|.*\s\Q$new\E$|| ; s|(\s)\Q$new/\E|\1|" | \
- sort > "$new.files"
+ sort > "$new.files"
set +e
diff ${diffopts:-$diffoopts} "$old.files" "$new.files"
[[ $? -eq 0 || $? -eq 1 ]] || exit $?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/rpmdev-extract new/rpmdevtools-8.10/rpmdev-extract
--- old/rpmdevtools-8.9/rpmdev-extract 2016-06-25 14:46:09.000000000 +0200
+++ new/rpmdevtools-8.10/rpmdev-extract 2017-01-14 11:54:52.000000000 +0100
@@ -1,6 +1,10 @@
#!/bin/bash
# -*- coding: utf-8 -*-
+# TODO: *.pkg ->
+# xar -xf *.pkg
+# gunzip and cpio -ivdum all Payload files
+
# rpmdev-extract -- Extract various archives in "tar xvf" style
#
# Copyright (c) 2004-2014 Ville Skyttä
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/rpmdev-md5 new/rpmdevtools-8.10/rpmdev-md5
--- old/rpmdevtools-8.9/rpmdev-md5 2009-07-28 19:13:46.000000000 +0200
+++ new/rpmdevtools-8.10/rpmdev-md5 2017-01-14 11:51:20.000000000 +0100
@@ -22,10 +22,10 @@
while test "$1"; do
case "$1" in
- --help) echo $"Usage: $name <archive-file>"; exit 0;;
- --version) echo $"$name 0.8"; exit 0;;
- --) shift; break;;
- *) break
+ --help) echo $"Usage: $name <archive-file>"; exit 0;;
+ --version) echo $"$name 0.8"; exit 0;;
+ --) shift; break;;
+ *) break
esac
shift
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/rpmdev-newinit.in new/rpmdevtools-8.10/rpmdev-newinit.in
--- old/rpmdevtools-8.9/rpmdev-newinit.in 2011-10-30 13:32:58.000000000 +0100
+++ new/rpmdevtools-8.10/rpmdev-newinit.in 2017-01-14 12:26:21.000000000 +0100
@@ -43,7 +43,7 @@
usage
echo ""
echo "Report bugs at https://bugzilla.redhat.com/, component rpmdevtools,"
- echo "or at https://fedorahosted.org/rpmdevtools/."
+ echo "or at https://pagure.io/rpmdevtools/issues."
}
usage() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/rpmdev-newspec.in new/rpmdevtools-8.10/rpmdev-newspec.in
--- old/rpmdevtools-8.9/rpmdev-newspec.in 2016-06-25 14:46:09.000000000 +0200
+++ new/rpmdevtools-8.10/rpmdev-newspec.in 2017-01-14 12:26:32.000000000 +0100
@@ -52,7 +52,7 @@
usage
echo ""
echo "Report bugs at https://bugzilla.redhat.com/, component rpmdevtools,"
- echo "or at https://fedorahosted.org/rpmdevtools/."
+ echo "or at https://pagure.io/rpmdevtools/issues."
}
usage() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/rpmdev-packager new/rpmdevtools-8.10/rpmdev-packager
--- old/rpmdevtools-8.9/rpmdev-packager 2016-06-25 14:46:09.000000000 +0200
+++ new/rpmdevtools-8.10/rpmdev-packager 2017-01-14 12:29:56.000000000 +0100
@@ -2,7 +2,7 @@
# rpmdev-packager -- guess rpm packager info from various sources
#
-# Copyright (c) 2009-2015 Ville Skyttä
+# Copyright (c) 2009-2016 Ville Skyttä
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
version()
{
cat <
This program is free software; you can redistribute it and/or modify
@@ -47,7 +47,7 @@
usage
echo ""
echo "Report bugs at https://bugzilla.redhat.com/, component rpmdevtools,"
- echo "or at https://fedorahosted.org/rpmdevtools/."
+ echo "or at https://pagure.io/rpmdevtools/issues."
}
usage() {
@@ -79,6 +79,10 @@
username="$( id -un )"
fullname="$( getent passwd $username 2>/dev/null | cut -d: -f5 )"
+fullname="${fullname%%,*}"
+# TODO obsolete, should use kerberos instead? e.g.
+# https://pagure.io/rpkg/blob/master/f/pyrpkg/__init__.py#_823
+# https://pagure.io/fedora-packager/c/715483c1bbdf5cceaeb63e90410139
certs=(~/.fedora.cert)
# Try $RPM_PACKAGER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/rpmdev-rmdevelrpms.py new/rpmdevtools-8.10/rpmdev-rmdevelrpms.py
--- old/rpmdevtools-8.9/rpmdev-rmdevelrpms.py 2016-01-03 21:44:28.000000000 +0100
+++ new/rpmdevtools-8.10/rpmdev-rmdevelrpms.py 2017-01-14 11:51:20.000000000 +0100
@@ -268,7 +268,8 @@
os.path.join(os.environ["HOME"],
".config/rpmdevtools/rmdevelrpms.conf")):
try:
- exec(compile(open(conf).read(), conf, "exec"))
+ with open(conf) as f:
+ exec(compile(f.read(), conf, "exec"))
except IOError:
pass
if hasattr(devpkgs, "split"):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/rpmdev-setuptree new/rpmdevtools-8.10/rpmdev-setuptree
--- old/rpmdevtools-8.9/rpmdev-setuptree 2015-03-03 09:59:51.000000000 +0100
+++ new/rpmdevtools-8.10/rpmdev-setuptree 2017-01-14 11:51:20.000000000 +0100
@@ -1,37 +1,37 @@
#!/bin/sh
#
-# RPM-build-tree.txt (a.k.a. fedora-buildrpmtree, rpmdev-setuptree)
+# RPM-build-tree.txt (a.k.a. fedora-buildrpmtree, rpmdev-setuptree)
#
-# Set up a 'plain userid' SRPM build environment
+# Set up a 'plain userid' SRPM build environment
#
-# Original home locale for this script:
-# http://www.rpm.org/hintskinks/buildtree/RPM-build-tree.txt
-# also: ftp://ftp.owlriver.com/pub/local/ORC/rpmbuild/
+# Original home locale for this script:
+# http://www.rpm.org/hintskinks/buildtree/RPM-build-tree.txt
+# also: ftp://ftp.owlriver.com/pub/local/ORC/rpmbuild/
#
-# based on a post:
-# Date: Tue, 30 Jul 2002 17:00:21 +0200
-# From: Ralf Ertzinger
-# Reply-To: rpm-list@freshrpms.net
+# based on a post:
+# Date: Tue, 30 Jul 2002 17:00:21 +0200
+# From: Ralf Ertzinger
+# Reply-To: rpm-list@freshrpms.net
#
-# copyright (c) 2002 Owl River Company - Columbus OH
-# info@owlriver.com -- GPL v.2
+# copyright (c) 2002 Owl River Company - Columbus OH
+# info@owlriver.com -- GPL v.2
#
[ "x$1" = "x-d" ] && {
- DEBUG="y"
- export DEBUG
- shift 1
- }
+ DEBUG="y"
+ export DEBUG
+ shift 1
+}
#
IAM=`id -un`
-# returns bare username
+# returns bare username
#
PASSWDDIR=`grep ^$IAM: /etc/passwd | awk -F":" '{print $6}'`
HOMEDIR=${HOME:=$PASSWDDIR}
[ ! -d $HOMEDIR ] && {
- echo "ERROR: Home directory for user $IAM not found in /etc/passwd."
- exit 1
- }
-# and home directory
+ echo "ERROR: Home directory for user $IAM not found in /etc/passwd."
+ exit 1
+}
+# and home directory
#
#
#
@@ -41,21 +41,21 @@
TOPDIR="%_topdir"
ISTOP=`grep -c ^$TOPDIR $RPMMACROS`
[ $ISTOP -lt 1 ] && {
- cat <<\EOF >> $RPMMACROS
+ cat <<\EOF >> $RPMMACROS
%_topdir %(echo $HOME)/rpmbuild
EOF
- }
+}
#
#MAKE="%make "
#ISTOP=`grep -c ^$MAKE $RPMMACROS`
#[ $ISTOP -lt 1 ] && {
-# echo "$MAKE make" >> $RPMMACROS
-# }
+# echo "$MAKE make" >> $RPMMACROS
+# }
#
ISTOP=`grep -c ^%__arch_install_post $RPMMACROS`
[ $ISTOP -lt 1 ] && {
- cat <<\EOF >> $RPMMACROS
+ cat <<\EOF >> $RPMMACROS
%__arch_install_post \
[ "%{buildarch}" = "noarch" ] || QA_CHECK_RPATHS=1 ; \
@@ -69,13 +69,13 @@
SRPMDIR=`rpm --eval "%{_srcrpmdir}"`
BUILDDIR=`rpm --eval "%{_builddir}"`
[ "x$DEBUG" != "x" ] && {
- echo "$IAM $HOMEDIR $RPMMACROS"
- echo "$RPMDIR $SRCDIR $SPECDIR"
- echo "$SRPMDIR $BUILDDIR"
- }
+ echo "$IAM $HOMEDIR $RPMMACROS"
+ echo "$RPMDIR $SRCDIR $SPECDIR"
+ echo "$SRPMDIR $BUILDDIR"
+}
#
-for i in $RPMDIR $SRCDIR $SPECDIR $SRPMDIR $BUILDDIR ; do
- [ ! -d $i ] && mkdir -p $i
+for i in $RPMDIR $SRCDIR $SPECDIR $SRPMDIR $BUILDDIR ; do
+ [ ! -d $i ] && mkdir -p $i
done
#
exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/rpminfo new/rpmdevtools-8.10/rpminfo
--- old/rpmdevtools-8.9/rpminfo 2013-04-09 17:45:26.000000000 +0200
+++ new/rpmdevtools-8.10/rpminfo 2017-01-14 11:51:20.000000000 +0100
@@ -65,87 +65,87 @@
[ -z "$1" ] && return
if [ -n "$opts" ]; then
- [ $split -eq 0 ] && opts="${opts}, " || opts="${opts},"
+ [ $split -eq 0 ] && opts="${opts}, " || opts="${opts},"
fi
opts="${opts}$1"
}
check_rpath() {
- [ $rpath -ne 1 ] && return
+ [ $rpath -ne 1 ] && return
local path=`$OBJDUMP -p "$1" 2>/dev/null | grep RPATH `
if [ -n "$path" ]; then
- path=`echo $path | awk '{print $2}'`
+ path=`echo $path | awk '{print $2}'`
## check rpath elements
- local odd=0
- if [ $test -eq 1 ]; then
- [ -z "$path" ] && odd=1
- OLDIFS=$IFS
- IFS=:
- for dir in $path; do
- [ -z "$dir" ] && odd=1
- [ "$dir" = "." ] && odd=2
- [ "$dir" = "/lib" ] && odd=3
- [ "$dir" = "/lib64" ] && odd=4
- [ "$dir" = "/usr/lib" ] && odd=5
- [ "$dir" = "/usr/lib64" ] && odd=6
- [ "$dir" = "/usr/X11R6/lib" ] && odd=7
- [ "$dir" = "/usr/X11R6/lib64" ] && odd=8
- [ "${dir:0:10}" = "/usr/local" ] && odd=9
- [ "${dir:0:12}" = "/usr/lib/qt-" ] && odd=10
- [ "${dir:0:8}" = "/usr/src" ] && odd=11
- echo $dir | grep -q "/\." && odd=12
- done
- IFS=$OLDIFS
- fi
- [ $odd -eq 0 ] && opt "RPATH $path" || opt "-RPATH $path"
+ local odd=0
+ if [ $test -eq 1 ]; then
+ [ -z "$path" ] && odd=1
+ OLDIFS=$IFS
+ IFS=:
+ for dir in $path; do
+ [ -z "$dir" ] && odd=1
+ [ "$dir" = "." ] && odd=2
+ [ "$dir" = "/lib" ] && odd=3
+ [ "$dir" = "/lib64" ] && odd=4
+ [ "$dir" = "/usr/lib" ] && odd=5
+ [ "$dir" = "/usr/lib64" ] && odd=6
+ [ "$dir" = "/usr/X11R6/lib" ] && odd=7
+ [ "$dir" = "/usr/X11R6/lib64" ] && odd=8
+ [ "${dir:0:10}" = "/usr/local" ] && odd=9
+ [ "${dir:0:12}" = "/usr/lib/qt-" ] && odd=10
+ [ "${dir:0:8}" = "/usr/src" ] && odd=11
+ echo $dir | grep -q "/\." && odd=12
+ done
+ IFS=$OLDIFS
+ fi
+ [ $odd -eq 0 ] && opt "RPATH $path" || opt "-RPATH $path"
fi
}
check_file() {
local file=$1
-
+
[ -L "$file" ] && return
[ ! -f "$file" ] && return
-
+
file -b "$file" 2>/dev/null | grep -q ELF || return
-
+
if $EU_READELF -h "$file" 2>/dev/null | grep -q 'Type:[[:space:]]*EXEC';
then
- if [ $exec -eq 1 ]; then
- if $READELF -d "$file" 2>/dev/null | grep -q TEXTREL; then
- if [ -u "$file" ]; then
- [ $no_pie -eq 1 ] && opt "!PIE"
- else
- [ $no_pic -eq 1 ] && opt "!PIC"
- fi
- else
- # suid
- if [ -u "$file" ]; then
- [ $no_pie -eq 1 ] && opt "!PIE"
- else
- [ $pic -eq 1 ] && opt "PIC"
- fi
- fi
- check_rpath "$file"
- fi
+ if [ $exec -eq 1 ]; then
+ if $READELF -d "$file" 2>/dev/null | grep -q TEXTREL; then
+ if [ -u "$file" ]; then
+ [ $no_pie -eq 1 ] && opt "!PIE"
+ else
+ [ $no_pic -eq 1 ] && opt "!PIC"
+ fi
+ else
+ # suid
+ if [ -u "$file" ]; then
+ [ $no_pie -eq 1 ] && opt "!PIE"
+ else
+ [ $pic -eq 1 ] && opt "PIC"
+ fi
+ fi
+ check_rpath "$file"
+ fi
else
- if $EU_READELF -d "$file" 2>/dev/null | grep -q ' DEBUG[[:space:]]*$';
- then
- if [ $exec -eq 1 ]; then
- [ $pie -eq 1 ] && opt "PIE"
- check_rpath "$file"
- fi
- else
- if [ $lib -eq 1 ]; then
- if $READELF -d "$file" 2>/dev/null | grep -q TEXTREL; then
- [ $no_pic -eq 1 ] && opt "DSO !PIC"
- else
- [ $pic -eq 1 ] && opt "DSO PIC"
- fi
- check_rpath "$file"
- fi
- fi
+ if $EU_READELF -d "$file" 2>/dev/null | grep -q ' DEBUG[[:space:]]*$';
+ then
+ if [ $exec -eq 1 ]; then
+ [ $pie -eq 1 ] && opt "PIE"
+ check_rpath "$file"
+ fi
+ else
+ if [ $lib -eq 1 ]; then
+ if $READELF -d "$file" 2>/dev/null | grep -q TEXTREL; then
+ [ $no_pic -eq 1 ] && opt "DSO !PIC"
+ else
+ [ $pic -eq 1 ] && opt "DSO PIC"
+ fi
+ check_rpath "$file"
+ fi
+ fi
fi
}
@@ -157,43 +157,43 @@
local files=`rpm -ql --nodigest --nosignature $package 2>/dev/null`
if echo $files | grep -q "not installed"; then
- # not installed
- if [ -f $package ]; then
- rpm -qp --nodigest --nosignature $package >& /dev/null
- if [ $? -eq 1 ]; then
- # no rpm package
- package=
- else
- prefix=$temp_prefix`basename $package`
- if [ ${package:0:1} != "/" ]; then
- package=`pwd`"/"$package
- fi
- local error=0
- mkdir $prefix 2> /dev/null && pushd "$prefix" >& /dev/null
- if [ $? -eq 0 ]; then
- rpm2cpio "$package" \
- | cpio -i --make-directories >& /dev/null
- [ $? -eq 0 ] || echo "Error while extracting package '$package'.. ignoring!" > /dev/stderr
- files=`rpm -qlp --nodigest --nosignature $package 2>/dev/null`
- popd >& /dev/null
- chmod -R u+rwx $prefix 2>/dev/null
- else
- error=1
- fi
- if [ $error -eq 1 ]; then
- echo "Can not create package directory.. skipping package '$package'!" > /dev/stderr
- return
- fi
- fi
- else
- # not a file
- package=
- fi
+ # not installed
+ if [ -f $package ]; then
+ rpm -qp --nodigest --nosignature $package >& /dev/null
+ if [ $? -eq 1 ]; then
+ # no rpm package
+ package=
+ else
+ prefix=$temp_prefix`basename $package`
+ if [ ${package:0:1} != "/" ]; then
+ package=`pwd`"/"$package
+ fi
+ local error=0
+ mkdir $prefix 2> /dev/null && pushd "$prefix" >& /dev/null
+ if [ $? -eq 0 ]; then
+ rpm2cpio "$package" \
+ | cpio -i --make-directories >& /dev/null
+ [ $? -eq 0 ] || echo "Error while extracting package '$package'.. ignoring!" > /dev/stderr
+ files=`rpm -qlp --nodigest --nosignature $package 2>/dev/null`
+ popd >& /dev/null
+ chmod -R u+rwx $prefix 2>/dev/null
+ else
+ error=1
+ fi
+ if [ $error -eq 1 ]; then
+ echo "Can not create package directory.. skipping package '$package'!" > /dev/stderr
+ return
+ fi
+ fi
+ else
+ # not a file
+ package=
+ fi
fi
if [ -z "$package" ]; then
- echo "'$1' is not installed and is no rpm package.. skipping!" > /dev/stderr
- return
+ echo "'$1' is not installed and is no rpm package.. skipping!" > /dev/stderr
+ return
fi
local in_pie=0
@@ -206,56 +206,56 @@
local in_rpath_odd=0
for file in $files; do
- opts=
+ opts=
- check_file "$prefix$file"
+ check_file "$prefix$file"
- [ -z "$opts" ] && continue
-
- if [ $split -eq 1 ]; then
- pkg=`basename $package`
- OLDIFS=$IFS
- IFS=,
- for opt in $opts; do
- o=
- [ "$opt" = "PIE" ] && o=pie
- [ "$opt" = "!PIE" ] && o=non_pie
- [ "$opt" = "PIC" ] && o=pic
- [ "$opt" = "DSO PIC" ] && o=dso_pic
- [ "$opt" = "!PIC" ] && o=non_pic
- [ "$opt" = "DSO !PIC" ] && o=dso_non_pic
- [ "${opt:0:6}" = "RPATH " ] && o=rpath && opt=${opt:6}
- [ "${opt:0:7}" = "-RPATH " ] && o=rpath_odd && opt=${opt:7}
- if [ -n "$o" ]; then
- eval local in=\${in_$o}
- if [ $in -eq 0 ]; then
- echo -e "\n$pkg" >> $output.$o
- eval in_$o=1
- fi
- if [ "${o:0:5}" = "rpath" -a $quiet -lt 2 ]; then
- echo -e "\t$file\tRPATH $opt" >> $output.$o
- else
- echo -e "\t$file" >> $output.$o
- fi
- fi
- done
- IFS=$OLDIFS
- else
- if [ -z "$pkg" ]; then
- pkg=`basename $package`
- echo -e "\n$pkg" >> $output
- fi
-
- if [ $quiet -eq 0 ]; then
- echo -e "\t$file\t$opts" >> $output
- else
- echo -e "\t$file" >> $output
- fi
- fi
+ [ -z "$opts" ] && continue
+
+ if [ $split -eq 1 ]; then
+ pkg=`basename $package`
+ OLDIFS=$IFS
+ IFS=,
+ for opt in $opts; do
+ o=
+ [ "$opt" = "PIE" ] && o=pie
+ [ "$opt" = "!PIE" ] && o=non_pie
+ [ "$opt" = "PIC" ] && o=pic
+ [ "$opt" = "DSO PIC" ] && o=dso_pic
+ [ "$opt" = "!PIC" ] && o=non_pic
+ [ "$opt" = "DSO !PIC" ] && o=dso_non_pic
+ [ "${opt:0:6}" = "RPATH " ] && o=rpath && opt=${opt:6}
+ [ "${opt:0:7}" = "-RPATH " ] && o=rpath_odd && opt=${opt:7}
+ if [ -n "$o" ]; then
+ eval local in=\${in_$o}
+ if [ $in -eq 0 ]; then
+ echo -e "\n$pkg" >> $output.$o
+ eval in_$o=1
+ fi
+ if [ "${o:0:5}" = "rpath" -a $quiet -lt 2 ]; then
+ echo -e "\t$file\tRPATH $opt" >> $output.$o
+ else
+ echo -e "\t$file" >> $output.$o
+ fi
+ fi
+ done
+ IFS=$OLDIFS
+ else
+ if [ -z "$pkg" ]; then
+ pkg=`basename $package`
+ echo -e "\n$pkg" >> $output
+ fi
+
+ if [ $quiet -eq 0 ]; then
+ echo -e "\t$file\t$opts" >> $output
+ else
+ echo -e "\t$file" >> $output
+ fi
+ fi
done
if [ -n "$prefix" ]; then
- rm -rf $prefix
+ rm -rf $prefix
fi
}
@@ -277,38 +277,38 @@
eval pkg=\${$OPTIND}
if [ ${pkg:0:1} = "-" ]; then
- [ "$pkg" = "-h" -o "$pkg" = "--help" ] && usage 0
- [ "$pkg" = "-v" -o "$pkg" = "--verbose" ] && verbose=1
- [ "$pkg" = "-q" -o "$pkg" = "--quiet" ] && quiet=1
- [ "$pkg" = "-qq" ] && quiet=2
- [ "$pkg" = "-i" -o "$pkg" = "--installed" ] && installed=1
- [ "$pkg" = "-e" -o "$pkg" = "--executables" ] && exec=1
- [ "$pkg" = "-l" -o "$pkg" = "--libraries" ] && lib=1
- [ "$pkg" = "-p" -o "$pkg" = "--pic" ] && pic=1
- [ "$pkg" = "-np" -o "$pkg" = "--no_pic" ] && no_pic=1
- [ "$pkg" = "-P" -o "$pkg" = "--pie" ] && pie=1
- [ "$pkg" = "-nP" -o "$pkg" = "--no_pie" ] && no_pie=1
- [ "$pkg" = "-r" -o "$pkg" = "--rpath" ] && rpath=1
- [ "$pkg" = "-s" -o "$pkg" = "--split" ] && split=1
- [ "$pkg" = "-t" -o "$pkg" = "--test" ] && test=1
- if [ "$pkg" = "-o" ]; then
- OPTIND=$((OPTIND+1))
- eval output=\${$OPTIND}
- fi
- if [ "${pkg:0:9}" = "--output=" ]; then
- output=${pkg:9};
- fi
- if [ "$pkg" = "-T" ]; then
- OPTIND=$((OPTIND+1))
- eval TMPDIR=\${$OPTIND}
- fi
- if [ "${pkg:0:10}" = "--tmp-dir=" ]; then
- TMPDIR=${pkg:10};
- fi
+ [ "$pkg" = "-h" -o "$pkg" = "--help" ] && usage 0
+ [ "$pkg" = "-v" -o "$pkg" = "--verbose" ] && verbose=1
+ [ "$pkg" = "-q" -o "$pkg" = "--quiet" ] && quiet=1
+ [ "$pkg" = "-qq" ] && quiet=2
+ [ "$pkg" = "-i" -o "$pkg" = "--installed" ] && installed=1
+ [ "$pkg" = "-e" -o "$pkg" = "--executables" ] && exec=1
+ [ "$pkg" = "-l" -o "$pkg" = "--libraries" ] && lib=1
+ [ "$pkg" = "-p" -o "$pkg" = "--pic" ] && pic=1
+ [ "$pkg" = "-np" -o "$pkg" = "--no_pic" ] && no_pic=1
+ [ "$pkg" = "-P" -o "$pkg" = "--pie" ] && pie=1
+ [ "$pkg" = "-nP" -o "$pkg" = "--no_pie" ] && no_pie=1
+ [ "$pkg" = "-r" -o "$pkg" = "--rpath" ] && rpath=1
+ [ "$pkg" = "-s" -o "$pkg" = "--split" ] && split=1
+ [ "$pkg" = "-t" -o "$pkg" = "--test" ] && test=1
+ if [ "$pkg" = "-o" ]; then
+ OPTIND=$((OPTIND+1))
+ eval output=\${$OPTIND}
+ fi
+ if [ "${pkg:0:9}" = "--output=" ]; then
+ output=${pkg:9};
+ fi
+ if [ "$pkg" = "-T" ]; then
+ OPTIND=$((OPTIND+1))
+ eval TMPDIR=\${$OPTIND}
+ fi
+ if [ "${pkg:0:10}" = "--tmp-dir=" ]; then
+ TMPDIR=${pkg:10};
+ fi
else
- packages="$packages $pkg"
+ packages="$packages $pkg"
fi
-
+
OPTIND=$((OPTIND+1))
done
@@ -342,10 +342,10 @@
if [ $split -eq 1 ]; then
if [ -z "$output" ]; then
- echo "You can not use split without an output file prefix.. exiting!"
- exit -1
+ echo "You can not use split without an output file prefix.. exiting!"
+ exit -1
else
- rm -f $output.*
+ rm -f $output.*
fi
fi
[ -n "$output" ] && rm -f $output || output=/dev/stdout
@@ -367,14 +367,14 @@
for pkg in $packages; do
tmp=`rpm -q --nodigest --nosignature $pkg | sort -u 2>/dev/null`
[ $verbose -eq 1 ] && \
- printf "(%*d/%d) => %s\n" ${#pkg_num} $pkg_no $pkg_num $pkg \
- > /dev/stderr
+ printf "(%*d/%d) => %s\n" ${#pkg_num} $pkg_no $pkg_num $pkg \
+ > /dev/stderr
if echo $tmp | grep -q "not installed"; then
- check_package $pkg
+ check_package $pkg
else
- for package in $tmp; do
- check_package $package
- done
+ for package in $tmp; do
+ check_package $package
+ done
fi
pkg_no=$((pkg_no+1))
done
@@ -382,7 +382,7 @@
if [ $installed -eq 1 ]; then
rpmqa=`rpm -qa --nodigest --nosignature | sort -u`
for i in $rpmqa; do
- check_package "$i"
+ check_package "$i"
done
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/template.init new/rpmdevtools-8.10/template.init
--- old/rpmdevtools-8.9/template.init 2011-04-03 14:33:12.000000000 +0200
+++ new/rpmdevtools-8.10/template.init 2017-01-14 11:51:20.000000000 +0100
@@ -66,7 +66,7 @@
if status $prog >/dev/null ; then
restart
fi
- ;;
+ ;;
reload)
# If config can be reloaded without restarting, implement it here,
# remove the "exit", and add "reload" to the usage message below.
++++++ suse-specfile.patch ++++++
++++ 669 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/rpmdevtools/suse-specfile.patch
++++ and /work/SRC/openSUSE:Factory/.rpmdevtools.new/suse-specfile.patch
++++++ suse-specfile_python.patch ++++++
Index: rpmdevtools-8.10/spectemplate-python.spec
===================================================================
--- rpmdevtools-8.10.orig/spectemplate-python.spec
+++ rpmdevtools-8.10/spectemplate-python.spec
@@ -1,117 +1,55 @@
-# sitelib for noarch packages, sitearch for others (remove the unneeded one)
-%{!?__python2: %global __python2 %__python}
-%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
-%if 0%{?fedora}
-%bcond_without python3
-%else
-%bcond_with python3
-%endif
+#
+# spec file for package [spectemplate]
+#
+# Copyright (c) __YEAR__ 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# 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/
+#
+
Name:
Version:
-Release: 1%{?dist}
+Release: 0
Summary:
-
-Group: Development/Languages
License:
-URL:
+Group: Development/Languages/Python
+Url:
Source0:
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:
-BuildRequires: python2-devel
-%if %{with python3}
-BuildRequires: python3-devel
-%endif # with python3
+BuildRequires: python-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+#BuildArch: noarch
%description
-%if %{with python3}
-%package -n
-Summary:
-Group: Development/Languages
-
-%description -n
-
-%endif # with python3
-
-
%prep
-%setup -q -c
-mv %{name}-%{version} python2
-
-%if %{with python3}
-cp -a python2 python3
-%endif # with python3
-
+%setup -q
%build
-pushd python2
# Remove CFLAGS=... for noarch packages (unneeded)
-CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup.py build
-popd
-
-%if %{with python3}
-pushd python3
-# Remove CFLAGS=... for noarch packages (unneeded)
-CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
-popd
-%endif # with python3
-
+CFLAGS="%{optflags}" python setup.py build
%install
-rm -rf $RPM_BUILD_ROOT
-# Must do the python3 install first because the scripts in /usr/bin are
-# overwritten with every setup.py install (and we want the python2 version
-# to be the default for now).
-%if %{with python3}
-pushd python3
-%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-popd
-%endif # with python3
-
-pushd python2
-%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-popd
-
+python setup.py install --prefix=%{_prefix} --root %{buildroot}
%check
-pushd python2
-%{__python2} setup.py test
-popd
-
-%if %{with python3}
-pushd python3
-%{__python3} setup.py test
-popd
-%endif
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+python setup.py test
%files
-%{!?_licensedir:%global license %%doc}
-%license add-license-file-here
-%doc add-docs-here
+%defattr(-,root,root)
+%doc
# For noarch packages: sitelib
-%{python2_sitelib}/*
+%{python_sitelib}/*
# For arch-specific packages: sitearch
-%{python2_sitearch}/*
-
-%if %{with python3}
-%files -n
-%license add-license-file-here
-%doc add-docs-here
-# For noarch packages: sitelib
-%{python3_sitelib}/*
-# For arch-specific packages: sitearch
-%{python3_sitearch}/*
-%endif # with python3
-
+%{python_sitearch}/*
%changelog
++++++ suse-specfile_python_single.patch ++++++
Index: rpmdevtools-8.10/spectemplate-python.spec
===================================================================
--- rpmdevtools-8.10.orig/spectemplate-python.spec
+++ rpmdevtools-8.10/spectemplate-python.spec
@@ -1,117 +1,59 @@
-# sitelib for noarch packages, sitearch for others (remove the unneeded one)
-%{!?__python2: %global __python2 %__python}
-%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
-%if 0%{?fedora}
-%bcond_without python3
-%else
-%bcond_with python3
-%endif
+#
+# spec file for package [spectemplate]
+#
+# Copyright (c) __YEAR__ 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# 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/
+#
+
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name:
Version:
-Release: 1%{?dist}
+Release: 0
Summary:
-
-Group: Development/Languages
License:
-URL:
+Group: Development/Languages/Python
+Url:
Source0:
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:
-BuildRequires: python2-devel
-%if %{with python3}
-BuildRequires: python3-devel
-%endif # with python3
+BuildRequires: %{python_module devel}
+BuildRequires: python-rpm-macros
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+#BuildArch: noarch
+%python_subpackages
%description
-%if %{with python3}
-%package -n
-Summary:
-Group: Development/Languages
-
-%description -n
-
-%endif # with python3
-
-
%prep
-%setup -q -c
-mv %{name}-%{version} python2
-
-%if %{with python3}
-cp -a python2 python3
-%endif # with python3
-
+%setup -q
%build
-pushd python2
-# Remove CFLAGS=... for noarch packages (unneeded)
-CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup.py build
-popd
-
-%if %{with python3}
-pushd python3
-# Remove CFLAGS=... for noarch packages (unneeded)
-CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
-popd
-%endif # with python3
-
+# Remove export CFLAGS=... for noarch packages (unneeded)
+export CFLAGS="%{optflags}"
+%python_build
%install
-rm -rf $RPM_BUILD_ROOT
-# Must do the python3 install first because the scripts in /usr/bin are
-# overwritten with every setup.py install (and we want the python2 version
-# to be the default for now).
-%if %{with python3}
-pushd python3
-%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-popd
-%endif # with python3
-
-pushd python2
-%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-popd
-
+%python_install
%check
-pushd python2
-%{__python2} setup.py test
-popd
-
-%if %{with python3}
-pushd python3
-%{__python3} setup.py test
-popd
-%endif
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%python_expand $python setup.py test
-
-%files
-%{!?_licensedir:%global license %%doc}
-%license add-license-file-here
-%doc add-docs-here
+%files %{python_files}
+%defattr(-,root,root)
+%doc
# For noarch packages: sitelib
-%{python2_sitelib}/*
+%{python_sitelib}/*
# For arch-specific packages: sitearch
-%{python2_sitearch}/*
-
-%if %{with python3}
-%files -n
-%license add-license-file-here
-%doc add-docs-here
-# For noarch packages: sitelib
-%{python3_sitelib}/*
-# For arch-specific packages: sitearch
-%{python3_sitearch}/*
-%endif # with python3
-
+%{python_sitearch}/*
%changelog