Hello community, here is the log from the commit of package rpmrebuild for openSUSE:Factory checked in at 2018-09-26 16:11:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmrebuild (Old) and /work/SRC/openSUSE:Factory/.rpmrebuild.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmrebuild" Wed Sep 26 16:11:21 2018 rev:23 rq:636343 version:2.13 Changes: -------- --- /work/SRC/openSUSE:Factory/rpmrebuild/rpmrebuild.changes 2017-09-17 22:40:07.277533025 +0200 +++ /work/SRC/openSUSE:Factory/.rpmrebuild.new/rpmrebuild.changes 2018-09-26 16:11:21.499492440 +0200 @@ -1,0 +2,19 @@ +Fri Sep 14 06:29:00 UTC 2018 - Bruno Friedmann <[email protected]> + +- Update to version 2.13 + + can handle recommends / supplements rpm tags + + previous 2.12-1 + - apply patch on requires from Bruce Jerrick : Handle + Requires(pre,post,preun,postun) + - add new requires syntax with if ( redhat-rpm-config ) + + previous 2.11-3 + - Made minor grammatical fixes to English language translations + (patch from beroset) + + previous 2.11-2 + - fix bad day of week in changelog (rpmbuild warning) + - add dependency to rpm-build package instead rpmbuild binary +- Packaging: + + spec-cleanup minimal (date,%licence) + + fix executable bit in %libexec/rpmrebuild + +------------------------------------------------------------------- Old: ---- rpmrebuild-2.11.tar.gz rpmrebuild-2.11.tar.gz.sig New: ---- rpmrebuild-2.13.tar.gz rpmrebuild-2.13.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmrebuild.spec ++++++ --- /var/tmp/diff_new_pack.WpKjL8/_old 2018-09-26 16:11:22.039491543 +0200 +++ /var/tmp/diff_new_pack.WpKjL8/_new 2018-09-26 16:11:22.043491537 +0200 @@ -1,7 +1,7 @@ # # spec file for package rpmrebuild # -# Copyright (c) 2017 SUSE LINUX 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,17 +12,17 @@ # 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/ # Name: rpmrebuild -Version: 2.11 +Version: 2.13 Release: 0 Summary: A tool to build a rpm file from the rpm database -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Packages -Url: http://rpmrebuild.sourceforge.net +URL: http://rpmrebuild.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz.sig Source2: %{name}.keyring @@ -50,15 +50,19 @@ %build make %{?_smp_mflags} +# Remove shebang on script that are sourced and not executed +find . -iname "*.src" -exec sed -i 's,^#!/bin/bash,,g' {} \; %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} "DESTDIR=%{buildroot}" +make DESTDIR=%{buildroot} install %{?_smp_mflags} mv %{buildroot}%{_mandir}/fr_FR.UTF-8/ %{buildroot}%{_mandir}/fr rm -rf %{buildroot}%{_mandir}/fr_FR/ +# chmod 0755 %%{buildroot}%%{_libexecdir}/rpmrebuild/*.sh %files %defattr(-,root,root,-) -%doc AUTHORS Changelog COPYING COPYRIGHT News README Todo +%license COPYING +%doc AUTHORS Changelog COPYRIGHT News README Todo %{_bindir}/rpmrebuild %{_libexecdir}/rpmrebuild %{_mandir}/fr/man1/* ++++++ rpmrebuild-2.11.tar.gz -> rpmrebuild-2.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Changelog new/Changelog --- old/Changelog 2017-09-10 15:23:42.000000000 +0200 +++ new/Changelog 2018-09-12 16:07:44.000000000 +0200 @@ -1,3 +1,13 @@ +* Wed Sep 12 2018 <[email protected]> 2.13-1 +- can handle recommends / supplements rpm tags + +* Fri Jul 20 2018 <[email protected]> 2.12-1 +- apply patch from Bruce Jerrick : Handle Requires(pre,post,preun,postun) +- add new requires syntax with if ( redhat-rpm-config ) + +* Sun Jun 10 2018 <[email protected]> 2.11-3 +- Made minor grammatical fixes to English language translations (patch from beroset) + * Sun Sep 10 2017 <[email protected]> 2.11-2 - fix bad day of week in changelog (rpmbuild warning) - add dependency to rpm-build package instead rpmbuild binary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Makefile new/Makefile --- old/Makefile 2017-09-10 15:19:53.000000000 +0200 +++ new/Makefile 2018-06-10 17:23:54.000000000 +0200 @@ -163,3 +163,4 @@ @echo "- man : build man pages" @echo "- html : build html pages" @echo "- alldist : build all packages" + @echo "- clean : clean temporay files" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/News new/News --- old/News 2014-06-10 09:53:34.000000000 +0200 +++ new/News 2018-09-12 16:15:20.000000000 +0200 @@ -1,3 +1,5 @@ +* 2018-09-12 : release 2.13, RECOMMENDS/SUPPLEMENTS rpm tag +* 2018-07-20 : release 2.12, Handle Requires(pre,post,preun,postun) * 2013-11-22 : release 2.11, option install * 2013-08-01 : release 2.10, patch for pretrans/postrans, DISTTAG * 2013-01-18 : release 2.9, fix to work with rpm 4.10 (Fedora 18) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Release new/Release --- old/Release 2017-09-10 15:27:24.000000000 +0200 +++ new/Release 2018-09-12 15:55:52.000000000 +0200 @@ -1 +1 @@ -2 +1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Version new/Version --- old/Version 2017-09-08 17:45:07.000000000 +0200 +++ new/Version 2018-09-12 16:07:44.000000000 +0200 @@ -1 +1 @@ -2.11 +2.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/locale/en/rpmrebuild.lang new/locale/en/rpmrebuild.lang --- old/locale/en/rpmrebuild.lang 2014-06-10 09:53:34.000000000 +0200 +++ new/locale/en/rpmrebuild.lang 2018-06-10 17:00:31.000000000 +0200 @@ -18,8 +18,8 @@ NotCompatibleOption='Not compatible options' PackageArgumentMissing='package argument missing' PackageMultiple='multiple package arguments is not allowed' -PackageNotInstalled='package in not installed' -PackageTooMuch='too much packages match' +PackageNotInstalled='package is not installed' +PackageTooMuch='too many packages match' RequiredArgument='requires an argument' #ShouldNotDirectory='should not be a directory' SpecFailed='specfile generation failed' @@ -36,7 +36,7 @@ UsageTitle="is a tool to rebuild an rpm file from the rpm database" UsageUsage='Usage' -UsageAdditional='additional flags to be pass to the rpmbuild' +UsageAdditional='additional flags to be passed to the rpmbuild' UsageBatch='batch mode (ask no questions)' UsageCapFs='use files posix capabilities from installed files' UsageCapDb='use files posix capabilities from rpm database' @@ -71,7 +71,7 @@ UsagePluginChangeFiles="command to modify package's files" UsagePluginChangeSpecWhole='command to modify whole specfile' -UsagePluginChangeSpec='command to modify appropriative part of the specfile' +UsagePluginChangeSpec='command to modify appropriate part of the specfile' UsagePluginEditWhole='edit whole specfile' -UsagePluginEdit='edit appropriative part of the specfile' +UsagePluginEdit='edit appropriate part of the specfile' UsagePluginHelp='print help about "regular" options' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/man/en/rpmrebuild.1.in new/man/en/rpmrebuild.1.in --- old/man/en/rpmrebuild.1.in 2017-09-10 15:19:11.000000000 +0200 +++ new/man/en/rpmrebuild.1.in 2018-09-12 16:07:44.000000000 +0200 @@ -153,7 +153,15 @@ \fB\-\-change\-spec\-enhances\fP=<\fIcommand\fP> .br \fB\-\-edit\-enhances -.LP +.LP +\fB\-\-change\-spec\-recommends\fP=<\fIcommand\fP> +.br +\fB\-\-edit\-recommends +.LP +\fB\-\-change\-spec\-supplements\fP=<\fIcommand\fP> +.br +\fB\-\-edit\-supplements +.LP \fB\-\-change\-spec\-description\fP=<\fIcommand\fP> .br \fB\-\-edit\-description diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/man/fr_FR/rpmrebuild.1.in new/man/fr_FR/rpmrebuild.1.in --- old/man/fr_FR/rpmrebuild.1.in 2014-06-10 09:53:34.000000000 +0200 +++ new/man/fr_FR/rpmrebuild.1.in 2018-09-12 16:07:44.000000000 +0200 @@ -152,6 +152,14 @@ .br \fB\-\-edit\-enhances .LP +\fB\-\-change\-spec\-recommends\fP=<\fIcommand\fP> +.br +\fB\-\-edit\-recommends +.LP +\fB\-\-change\-spec\-supplements\fP=<\fIcommand\fP> +.br +\fB\-\-edit\-supplements +.LP \fB\-\-change\-spec\-description\fP=<\fIcommand\fP> .br \fB\-\-edit\-description diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/man/fr_FR.UTF-8/rpmrebuild.1.in new/man/fr_FR.UTF-8/rpmrebuild.1.in --- old/man/fr_FR.UTF-8/rpmrebuild.1.in 2014-06-10 09:53:34.000000000 +0200 +++ new/man/fr_FR.UTF-8/rpmrebuild.1.in 2018-09-12 16:07:44.000000000 +0200 @@ -152,6 +152,14 @@ .br \fB\-\-edit\-enhances .LP +\fB\-\-change\-spec\-recommends\fP=<\fIcommand\fP> +.br +\fB\-\-edit\-recommends +.LP +\fB\-\-change\-spec\-supplements\fP=<\fIcommand\fP> +.br +\fB\-\-edit\-supplements +.LP \fB\-\-change\-spec\-description\fP=<\fIcommand\fP> .br \fB\-\-edit\-description diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/processing_func.src new/processing_func.src --- old/processing_func.src 2017-09-10 15:29:36.000000000 +0200 +++ new/processing_func.src 2018-09-12 16:28:06.000000000 +0200 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2004 by Valery Reznic # This file is a part of the rpmrebuild project -# $Id: rpmrebuild-2.11 | processing_func.src | Thu Jul 25 10:07:15 2013 +0000 | valery_reznic $ +# $Id: rpmrebuild-2.13 | processing_func.src | Wed Sep 12 15:59:23 2018 +0200 | Eric Gerbier $ # # 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 @@ -38,6 +38,8 @@ SPEC_REQUIRES=$SPEC_DIR/requires SPEC_SUGGESTS=$SPEC_DIR/suggests SPEC_ENHANCES=$SPEC_DIR/enhances + SPEC_RECOMMENDS=$SPEC_DIR/recommends + SPEC_SUPPLEMENTS=$SPEC_DIR/supplements SPEC_TRIGGERS=$SPEC_DIR/triggers SPEC_VERIFYSCRIPT=$SPEC_DIR/verifyscript @@ -59,6 +61,8 @@ si_requires=1 si_suggests=1 si_enhances=1 + si_recommends=1 + si_supplements=1 si_triggers=1 si_verifyscript=1 si_rpmqf=1 @@ -198,6 +202,20 @@ SPEC_OUT=$SPEC_ENHANCES.$si_enhances ;; + Xchange-spec-recommends | \ + Xedit-recommends) + SPEC_IN=$SPEC_RECOMMENDS.$si_recommends + si_recommends=$[si_recommends + 1] + SPEC_OUT=$SPEC_RECOMMENDS.$si_recommends + ;; + + Xchange-spec-supplements | \ + Xedit-supplements) + SPEC_IN=$SPEC_SUPPLEMENTS.$si_supplements + si_supplements=$[si_supplements + 1] + SPEC_OUT=$SPEC_SUPPLEMENTS.$si_supplements + ;; + Xchange-spec-triggers | \ Xedit-triggers) SPEC_IN=$SPEC_TRIGGERS.$si_triggers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild new/rpmrebuild --- old/rpmrebuild 2017-09-10 15:29:36.000000000 +0200 +++ new/rpmrebuild 2018-09-12 16:28:06.000000000 +0200 @@ -4,7 +4,7 @@ # # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] -# $Id: rpmrebuild-2.11 | rpmrebuild | Thu May 17 15:04:50 2012 +0000 | gerbier $ +# $Id: rpmrebuild-2.13 | rpmrebuild | Thu May 17 15:04:50 2012 +0000 | gerbier $ # # 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.lsm new/rpmrebuild.lsm --- old/rpmrebuild.lsm 2017-09-10 15:29:06.000000000 +0200 +++ new/rpmrebuild.lsm 2018-09-12 16:11:59.000000000 +0200 @@ -1,7 +1,7 @@ Begin4 Title: rpmrebuild -Version: 2.11 -Entered-date: 2017-09-10 +Version: 2.13 +Entered-date: 2018-09-12 Description: rpmrebuild creates spec files used by the Red Hat Package Manager in building RPM packages. It uses the information it can determine (from the rpm database) to fill in the proper spec file fields. @@ -12,7 +12,7 @@ Author: [email protected] (Eric Gerbier) [email protected] (Valery Reznic) Primary-site: http://rpmrebuild.sourceforge.net - 90 ko rpmrebuild-2.11-2.noarch.rpm + 90 ko rpmrebuild-2.13-1.noarch.rpm Platforms: linux, works with bash and rpm >= 3.x Copying-policy: GPL End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.sh new/rpmrebuild.sh --- old/rpmrebuild.sh 2017-09-10 15:29:36.000000000 +0200 +++ new/rpmrebuild.sh 2018-09-12 16:28:06.000000000 +0200 @@ -4,7 +4,7 @@ # # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] -# $Id: rpmrebuild-2.11 | rpmrebuild.sh | Tue Aug 20 11:19:59 2013 +0000 | gerbier $ +# $Id: rpmrebuild-2.13 | rpmrebuild.sh | Tue Aug 20 11:19:59 2013 +0000 | gerbier $ # # 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 @@ -17,7 +17,7 @@ # GNU General Public License for more details. # ############################################################################### -VERSION="$Id: rpmrebuild-2.11 | rpmrebuild.sh | Tue Aug 20 11:19:59 2013 +0000 | gerbier $" +VERSION="$Id: rpmrebuild-2.13 | rpmrebuild.sh | Tue Aug 20 11:19:59 2013 +0000 | gerbier $" # debug #set -x diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.spc new/rpmrebuild.spc --- old/rpmrebuild.spc 2017-09-10 15:21:03.000000000 +0200 +++ new/rpmrebuild.spc 2018-07-07 16:31:34.000000000 +0200 @@ -21,6 +21,7 @@ Requires: bash Requires: cpio Requires: sed +Requires: gawk %if %is_rpm3 # rpm v3 @@ -43,11 +44,11 @@ %global _source_filedigest_algorithm 1 %description -rpmrebuild allow to build an rpm file from an installed rpm, or from +rpmrebuild allows to build an rpm file from an installed rpm, or from another rpm file, with or without changes (batch or interactive). It can be extended by a plugin system. -A typical use is to easy repackage a software after some configuration's -change. +A typical use is to easily repackage a software after some configuration +changes. %description -l fr rpmbuild permet de fabriquer un package rpm à partir d'un @@ -61,11 +62,11 @@ %setup -c rpmrebuild %build -make +make %{?_smp_mflags} %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -make DESTDIR="$RPM_BUILD_ROOT" install +make install DESTDIR="$RPM_BUILD_ROOT" %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.spec new/rpmrebuild.spec --- old/rpmrebuild.spec 2017-09-10 15:27:33.000000000 +0200 +++ new/rpmrebuild.spec 2018-09-12 16:28:06.000000000 +0200 @@ -1,5 +1,5 @@ -Version: 2.11 -%define release 2 +Version: 2.13 +%define release 1 # get rpm version %define rpm_ver %( rpm -q --queryformat='%{VERSION}' rpm | cut -f 1 -d.) # test for an rpm version @@ -23,6 +23,7 @@ Requires: bash Requires: cpio Requires: sed +Requires: gawk %if %is_rpm3 # rpm v3 @@ -45,11 +46,11 @@ %global _source_filedigest_algorithm 1 %description -rpmrebuild allow to build an rpm file from an installed rpm, or from +rpmrebuild allows to build an rpm file from an installed rpm, or from another rpm file, with or without changes (batch or interactive). It can be extended by a plugin system. -A typical use is to easy repackage a software after some configuration's -change. +A typical use is to easily repackage a software after some configuration +changes. %description -l fr rpmbuild permet de fabriquer un package rpm à partir d'un @@ -63,11 +64,11 @@ %setup -c rpmrebuild %build -make +make %{?_smp_mflags} %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -make DESTDIR="$RPM_BUILD_ROOT" install +make install DESTDIR="$RPM_BUILD_ROOT" %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" @@ -75,6 +76,16 @@ %files -f rpmrebuild.files %changelog +* Wed Sep 12 2018 <[email protected]> 2.13-1 +- can handle recommends / supplements rpm tags + +* Fri Jul 20 2018 <[email protected]> 2.12-1 +- apply patch from Bruce Jerrick : Handle Requires(pre,post,preun,postun) +- add new requires syntax with if ( redhat-rpm-config ) + +* Sun Jun 10 2018 <[email protected]> 2.11-3 +- Made minor grammatical fixes to English language translations (patch from beroset) + * Sun Sep 10 2017 <[email protected]> 2.11-2 - fix bad day of week in changelog (rpmbuild warning) - add dependency to rpm-build package instead rpmbuild binary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_buildroot.sh new/rpmrebuild_buildroot.sh --- old/rpmrebuild_buildroot.sh 2017-09-10 15:29:36.000000000 +0200 +++ new/rpmrebuild_buildroot.sh 2018-09-12 16:28:06.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2002, 2003, 2013 by Valery Reznic # Bug reports to: [email protected] # or : [email protected] -# $Id: rpmrebuild-2.11 | rpmrebuild_buildroot.sh | Mon Jan 14 12:35:18 2013 +0000 | valery_reznic $ +# $Id: rpmrebuild-2.13 | rpmrebuild_buildroot.sh | Mon Jan 14 12:35:18 2013 +0000 | valery_reznic $ # # 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_extract_tags.sh new/rpmrebuild_extract_tags.sh --- old/rpmrebuild_extract_tags.sh 2017-09-10 15:29:36.000000000 +0200 +++ new/rpmrebuild_extract_tags.sh 2018-09-12 16:28:06.000000000 +0200 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] -# $Id: rpmrebuild-2.11 | rpmrebuild_extract_tags.sh | Tue Feb 14 09:30:42 2012 +0000 | gerbier $ +# $Id: rpmrebuild-2.13 | rpmrebuild_extract_tags.sh | Tue Feb 14 09:30:42 2012 +0000 | gerbier $ # # 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_files.sh new/rpmrebuild_files.sh --- old/rpmrebuild_files.sh 2017-09-10 15:29:36.000000000 +0200 +++ new/rpmrebuild_files.sh 2018-09-12 16:28:06.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2002, 2003, 2013 by Valery Reznic # Bug reports to: [email protected] # or : [email protected] -# $Id: rpmrebuild-2.11 | rpmrebuild_files.sh | Mon Jan 14 12:35:18 2013 +0000 | valery_reznic $ +# $Id: rpmrebuild-2.13 | rpmrebuild_files.sh | Mon Jan 14 12:35:18 2013 +0000 | valery_reznic $ # # 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_ghost.sh new/rpmrebuild_ghost.sh --- old/rpmrebuild_ghost.sh 2017-09-10 15:29:36.000000000 +0200 +++ new/rpmrebuild_ghost.sh 2018-09-12 16:28:06.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2002, 2003, 2013 by Valery Reznic # Bug reports to: [email protected] # or : [email protected] -# $Id: rpmrebuild-2.11 | rpmrebuild_ghost.sh | Mon Jan 14 12:35:18 2013 +0000 | valery_reznic $ +# $Id: rpmrebuild-2.13 | rpmrebuild_ghost.sh | Mon Jan 14 12:35:18 2013 +0000 | valery_reznic $ # # 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_lib.src new/rpmrebuild_lib.src --- old/rpmrebuild_lib.src 2017-09-10 15:29:36.000000000 +0200 +++ new/rpmrebuild_lib.src 2018-09-12 16:28:06.000000000 +0200 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2011 by Eric Gerbier # This file is a part of the rpmrebuild project -# $Id: rpmrebuild-2.11 | rpmrebuild_lib.src | Wed Nov 27 20:21:55 2013 +0100 | Eric Gerbier $ +# $Id: rpmrebuild-2.13 | rpmrebuild_lib.src | Wed Nov 27 20:21:55 2013 +0100 | Eric Gerbier $ # # 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_parser.src new/rpmrebuild_parser.src --- old/rpmrebuild_parser.src 2017-09-10 15:29:36.000000000 +0200 +++ new/rpmrebuild_parser.src 2018-09-12 16:28:06.000000000 +0200 @@ -1,9 +1,10 @@ +#!/bin/bash # to be sourced from bash ############################################################################### # # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] -# $Id: rpmrebuild-2.11 | rpmrebuild_parser.src | Tue Aug 20 11:19:59 2013 +0000 | gerbier $ +# $Id: rpmrebuild-2.13 | rpmrebuild_parser.src | Wed Sep 12 15:59:23 2018 +0200 | Eric Gerbier $ # # 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 @@ -75,6 +76,8 @@ --change-spec-requires=<command> --change-spec-suggests=<command> --change-spec-enhances=<command> + --change-spec-recommends=<command> + --change-spec-supplements=<command> --change-spec-description=<command> --change-spec-files=<command> --change-spec-triggers=<command> @@ -97,6 +100,8 @@ --edit-requires --edit-suggests --edit-enhances + --edit-recommends + --edit-supplements --edit-description --edit-files --edit-triggers @@ -424,8 +429,17 @@ LONG_OPTION="change-spec-provides" ;; - change-spec-r | \ - change-spec-re | \ + change-spec-rec | \ + change-spec-reco | \ + change-spec-recom | \ + change-spec-recomm | \ + change-spec-recomme | \ + change-spec-recommen | \ + change-spec-recommend | \ + change-spec-recommends) + LONG_OPTION="change-spec-recommends" + ;; + change-spec-req | \ change-spec-requ | \ change-spec-requi | \ @@ -435,8 +449,6 @@ LONG_OPTION="change-spec-requires" ;; - change-spec-s | \ - change-spec-su | \ change-spec-sug | \ change-spec-sugg | \ change-spec-sugge | \ @@ -446,6 +458,18 @@ LONG_OPTION="change-spec-suggests" ;; + change-spec-sup | \ + change-spec-supp | \ + change-spec-suppl | \ + change-spec-supple | \ + change-spec-supplem | \ + change-spec-suppleme | \ + change-spec-supplemen | \ + change-spec-supplement | \ + change-spec-supplements) + LONG_OPTION="change-spec-supplements" + ;; + change-spec-t | \ change-spec-tr | \ change-spec-tri | \ @@ -667,7 +691,17 @@ LONG_OPTION='edit-provides' ;; - edit-r | \ + edit-rec | \ + edit-reco | \ + edit-recom | \ + edit-recomm | \ + edit-recomme | \ + edit-recommen | \ + edit-recommend | \ + edit-recommends) + LONG_OPTION='edit-recommends' + ;; + edit-re | \ edit-req | \ edit-requ | \ @@ -689,7 +723,6 @@ LONG_OPTION='edit-whole' # alias ;; - edit-su | \ edit-sug | \ edit-sugg | \ edit-sugge | \ @@ -699,6 +732,18 @@ LONG_OPTION="edit-suggests" ;; + edit-sup | \ + edit-supp | \ + edit-suppl | \ + edit-supple | \ + edit-supplem | \ + edit-suppleme | \ + edit-supplemen | \ + edit-supplement | \ + edit-supplements) + LONG_OPTION="edit-supplements" + ;; + edit-t | \ edit-tr | \ edit-tri | \ @@ -999,7 +1044,9 @@ change-spec-postun | \ change-spec-provides | \ change-spec-requires | \ + change-spec-recommends | \ change-spec-suggests | \ + change-spec-supplements | \ change-spec-triggers | \ change-spec-verifyscript | \ change-spec-whole) @@ -1051,6 +1098,8 @@ edit-provides | \ edit-requires | \ edit-suggests | \ + edit-recommends | \ + edit-supplements | \ edit-triggers | \ edit-verifyscript | \ edit-whole) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_rpmqf.src new/rpmrebuild_rpmqf.src --- old/rpmrebuild_rpmqf.src 2017-09-10 15:29:36.000000000 +0200 +++ new/rpmrebuild_rpmqf.src 2018-09-12 16:28:06.000000000 +0200 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] -# $Id: rpmrebuild-2.11 | rpmrebuild_rpmqf.src | Thu Jul 25 10:07:15 2013 +0000 | valery_reznic $ +# $Id: rpmrebuild-2.13 | rpmrebuild_rpmqf.src | Wed Sep 12 15:59:23 2018 +0200 | Eric Gerbier $ # # 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 @@ -81,6 +81,13 @@ echo '%|REQUIRENAME?{[Requires: %{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]}|' } +# Similar to qf_spec_requires, but includes an undecoded REQUIREFLAGS, and does +# not include the "Requires:" string. +# Intended to allow further decoding of REQUIREFLAGS . +function qf_spec_requires_raw { +echo '%|REQUIRENAME?{[%{REQUIRENAME} %{REQUIREFLAGS} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]}|' +} + function qf_spec_suggest { echo "#suggest" echo '%|SUGGESTSNAME?{[Suggests: %{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n]}|' @@ -91,6 +98,16 @@ echo '%|ENHANCESNAME?{[Enhances: %{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n]}|' } +function qf_spec_recommends { +echo "#recommends" +echo '%|RECOMMENDNAME?{[Recommends: %{RECOMMENDNAME} %{RECOMMENDFLAGS:depflags} %{RECOMMENDVERSION}\n]}|' +} + +function qf_spec_supplements { +echo "#supplements" +echo '%|SUPPLEMENTNAME?{[Supplements: %{SUPPLEMENTNAME} %{SUPPLEMENTFLAGS:depflags} %{SUPPLEMENTVERSION}\n]}|' +} + function qf_spec_description { echo '%|DESCRIPTION?{[%{DESCRIPTION}\n]}|' } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec_func.src new/spec_func.src --- old/spec_func.src 2017-09-10 15:29:36.000000000 +0200 +++ new/spec_func.src 2018-09-12 16:28:06.000000000 +0200 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2004, 2009 by Valery Reznic # This file is a part of the rpmrebuild project -# $Id: rpmrebuild-2.11 | spec_func.src | Thu Jul 25 10:07:15 2013 +0000 | valery_reznic $ +# $Id: rpmrebuild-2.13 | spec_func.src | Wed Sep 12 15:59:23 2018 +0200 | Eric Gerbier $ # # 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 @@ -99,10 +99,47 @@ # Comment out Requires with rpmlib() local sed_requires='/Requires[[:space:]]*:[[:space:]]*rpmlib(.*)/s/^/#/' [ "X$autorequire" = "Xyes" ] && sed_requires="$sed_requires$sed_comment" - spec_query qf_spec_requires | sed -e "$sed_requires" || return + spec_query qf_spec_requires_raw | decode_requires \ + | sed -e "$sed_requires" || return return 0 } +function decode_requires +{ + # Decode the REQUIREFLAGS bits to dependency attributes. + # Bits are defined in lib/rpmlib.h in the rpm source code. + awk ' + BEGIN { + PRE = lshift(1, 9); + POST = lshift(1, 10); + PREUN = lshift(1, 11); + POSTUN = lshift(1, 12); + } + { + if ($2 == "if") { + printf("Requires: "); + for (i=1;i<NF;i++) { + printf("%s "), $i; + } + printf("\n"); + } else { + attr=""; + if (and($2, PRE)) attr = (attr=="" ? "pre" : attr ",pre") + if (and($2, POST)) attr = (attr=="" ? "post" : attr ",post") + if (and($2, PREUN)) attr = (attr=="" ? "preun" : attr ",preun") + if (and($2, POSTUN)) attr = (attr=="" ? "postun" : attr ",postun") + if (attr=="") { + req = "Requires:" + } else { + req = "Requires(" attr "):"; + } + printf("%-14s %s %s %s\n", req, $1, $3, $4); + } + } + ' + return +} + function SpecGeneration { # Comment Out every string @@ -116,8 +153,10 @@ spec_requires > $SPEC_REQUIRES.$i || return spec_query qf_spec_suggest > $SPEC_SUGGESTS.$i || return spec_query qf_spec_enhance > $SPEC_ENHANCES.$i || return + spec_query qf_spec_recommends > $SPEC_RECOMMENDS.$i || return + spec_query qf_spec_supplements > $SPEC_SUPPLEMENTS.$i || return spec_query qf_spec_description > $SPEC_DESCRIPTION.$i || return - spec_files > $SPEC_FILES.$i || return + spec_files > $SPEC_FILES.$i || return spec_query qf_spec_triggers > $SPEC_TRIGGERS.$i || return spec_query qf_spec_pre > $SPEC_PRE.$i || return spec_query qf_spec_pretrans > $SPEC_PRETRANS.$i || return @@ -168,6 +207,8 @@ $SPEC_REQUIRES.$si_requires \ $SPEC_SUGGESTS.$si_suggests \ $SPEC_ENHANCES.$si_enhances \ + $SPEC_RECOMMENDS.$si_recommends \ + $SPEC_SUPPLEMENTS.$si_supplements \ || return echo || return
