Hello community, here is the log from the commit of package rpmrebuild for openSUSE:Factory checked in at 2017-09-17 22:39:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmrebuild (Old) and /work/SRC/openSUSE:Factory/.rpmrebuild.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmrebuild" Sun Sep 17 22:39:13 2017 rev:22 rq:526523 version:2.11 Changes: -------- --- /work/SRC/openSUSE:Factory/rpmrebuild/rpmrebuild.changes 2015-05-10 10:46:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpmrebuild.new/rpmrebuild.changes 2017-09-17 22:40:07.277533025 +0200 @@ -1,0 +2,10 @@ +Sat Sep 16 10:01:10 UTC 2017 - [email protected] + +- New release of source code (2.11) release -2 + + fix bad day of week in changelog (rpmbuild warning) + + add dependency to rpm-build package instead rpmbuild binary +- Adjust patch rpmrebuild-fix-bashims.patch +- Pick new gpg block for rpmrebuild.keyring +- Spec cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmrebuild.spec ++++++ --- /var/tmp/diff_new_pack.i1YsZ2/_old 2017-09-17 22:40:07.889446989 +0200 +++ /var/tmp/diff_new_pack.i1YsZ2/_new 2017-09-17 22:40:07.909444178 +0200 @@ -1,7 +1,7 @@ # # spec file for package rpmrebuild # -# Copyright (c) 2015 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 @@ -34,7 +34,6 @@ Requires: cpio Requires: rpm-build Requires: sed -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description ++++++ rpmrebuild-2.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Changelog new/Changelog --- old/Changelog 2013-11-22 10:17:12.000000000 +0100 +++ new/Changelog 2017-09-10 15:23:42.000000000 +0200 @@ -1,10 +1,14 @@ -* Wed Nov 22 2013 <[email protected]> 2.11 +* 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 + +* Fri Nov 22 2013 <[email protected]> 2.11 - add install option * Sun Aug 11 2013 <[email protected]> 2.10-2 - bugfix from 2.10 on test install : test was inverted (applied on rpm files instead installed rpm) -* Tue Aug 01 2013 <[email protected]> 2.10 +* Thu Aug 01 2013 <[email protected]> 2.10 - add tag DISTTAG (feature request) - do not test install if work on rpm files - applied patch from Olivier Bourdon for pretrans and postrans @@ -12,12 +16,12 @@ * Sun Jan 13 2013 <[email protected]> 2.9 - fix to work with rpm 4.10 (Fedora 18) - error: incorrect format: invalid field width -* Thu Jul 11 2012 <[email protected]> 2.8 +* Wed Jul 11 2012 <[email protected]> 2.8 - can handle SUGGESTS/ENHANCES rpm tag - add --cap-from-fs/cap-from-db options - build rpmrebuild-version.tar.gz to allow rpmbuild -tb work -* Thu Jun 06 2012 <[email protected]> 2.7 +* Wed Jun 06 2012 <[email protected]> 2.7 - patch from Andreas Kainz for package file checking - add new unset_tag plugin - add support for rpm version 5 (mandriva) @@ -42,10 +46,10 @@ * Fri Dec 11 2009 <[email protected]> 2.4 - add -l / --list-plugin option -* Tue Nov 12 2009 <[email protected]> +* Thu Nov 12 2009 <[email protected]> - add -5 / --md5-compat-digest option -* Wed Jan 09 2009 <[email protected]> 2.3 +* Fri Jan 09 2009 <[email protected]> 2.3 - release version 2.3 * Tue Dec 16 2008 <[email protected]> @@ -54,7 +58,7 @@ * Tue Dec 16 2008 <[email protected]> - fix for rpm 4.6 (fedora 10), that ignore BuildRoot in the spec file flag -* Wed Dec 05 2008 <[email protected]> +* Fri Dec 05 2008 <[email protected]> - do not use popt any more * Wed Aug 06 2008 <[email protected]> 2.2.3-1 @@ -126,18 +130,18 @@ * Sun Nov 14 2004 <[email protected]> 2.0.0-1 - rpmrebuild_parser.src - added '--help-plugins' option -* Wed Oct 26 2004 <[email protected]> 2.0.0-1 +* Tue Oct 26 2004 <[email protected]> 2.0.0-1 - processing of /change/modify/edit was moved to the processng_func.src - changes to support --change-spec-* ane --edit-* (in the processing_func, rpmrebuild_popt and rpmrebuild_parser) - added '--include' option -* Wed Sep 28 2004 <[email protected]> 2.0.0-1 +* Tue Sep 28 2004 <[email protected]> 2.0.0-1 - changed all env variables' names to be prefixed with RPMREBUILD_ -* Tue Sep 27 2004 <[email protected]> 2.0.0-1 +* Mon Sep 27 2004 <[email protected]> 2.0.0-1 - change different variables values from empty/non-empty to yes/no -* Tue Sep 20 2004 <[email protected]> 2.0.0-1 +* Mon Sep 20 2004 <[email protected]> 2.0.0-1 - Added support for arbitrary execution order for change/edit/modify * Sun Sep 19 2004 <[email protected]> 2.0.0-1 @@ -220,39 +224,39 @@ * Fri Jan 17 2003 <[email protected]> 1.4.0-1 - public release of 1.3 dev branch -* Mon Dec 29 2002 <[email protected]> 1.3-1 +* Sun Dec 29 2002 <[email protected]> 1.3-1 - add '-p' option. Now is possible rebuild not only installed rpm, but rpm file too. May be usefull with '-e' or '--filter' option -* Mon Dec 18 2002 <[email protected]> 1.3-1 +* Wed Dec 18 2002 <[email protected]> 1.3-1 - more simple and robust filter * Thu Dec 12 2002 <[email protected]> 1.3.1 - add filter option for "pluggins" - rewrite --resolv-dep as pluggin -* Mon Dec 10 2002 <[email protected]> 1.3-0 +* Tue Dec 10 2002 <[email protected]> 1.3-0 - change long options name to be more consistant - added support for %%lang -* Mon Dec 10 2002 <[email protected]> 1.3.0 +* Tue Dec 10 2002 <[email protected]> 1.3.0 - add man page - fix bug with % in changelog - add -r|--resolv-dep option - add french translation in specfile -* Sat Dec 3 2002 <[email protected]> 1.3.0 +* Tue Dec 3 2002 <[email protected]> 1.3.0 - added long options -* Sat Dec 2 2002 <[email protected]> 1.2-0 +* Mon Dec 2 2002 <[email protected]> 1.2-0 - now rpmrebuild can be run as 'rpm --rpmrebuild' -* Sat Nov 24 2002 <[email protected]> 1.1-1 +* Sun Nov 24 2002 <[email protected]> 1.1-1 - filter "(none)" answer from rpm the scripts queries * Sat Nov 23 2002 <[email protected]> 1.1-0 - filter "(none)" answer from rpm queries -* Thu Oct 22 2002 <[email protected]> 1.0-0 +* Tue Oct 22 2002 <[email protected]> 1.0-0 - replace vi by %%define - add command lines options (-h : help, -v : verbose, -V: version) - add lsm description @@ -287,18 +291,18 @@ - add triggers (thanks to Han Holl <[email protected]> - add many other spec tags (icon, exlude*, serial, provides, conflicts ...) -* Sun Sep 20 2002 <[email protected]> 0.5.0 +* Fri Sep 20 2002 <[email protected]> 0.5.0 - try to have it work on any distribution - the rpm package is now signed with my gpg key -* Mon Sep 17 2002 <[email protected]> 0.4.2 +* Tue Sep 17 2002 <[email protected]> 0.4.2 - add architecture support (thanks to Han Holl <[email protected]>) - add add require, obsolete tags - force time format with LC_TIME to POSIX - change shell name to match project name - full english messages -* Mon Sep 17 2002 <[email protected]> 0.4.1 +* Tue Sep 17 2002 <[email protected]> 0.4.1 - suppress useless exit - shell cosmetic changes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Makefile new/Makefile --- old/Makefile 2013-08-15 15:50:14.000000000 +0200 +++ new/Makefile 2017-09-10 15:19:53.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile 852 2013-08-15 13:50:14Z gerbier $ +# $Id$ # TOP_DIR := . include $(TOP_DIR)/Makefile.include @@ -18,6 +18,7 @@ --define '_srcrpmdir $(RPM_SRPMS_DIR)' \ --define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' +PACKAGE=rpmrebuild VERSION=$(shell cat Version) TAR_FILE := $(RPM_SOURCE_DIR)/rpmrebuild-$(VERSION).tar.gz @@ -44,6 +45,8 @@ LOCALE_BASE := \ rpmrebuild.lang +KEYWORD_FILES = $(SCRIPTS) $(LIB_SCRIPTS) $(INCLUDE_SCRIPTS) + MANPAGES := $(foreach lang,$(LANGS),$(addprefix man/$(lang)/,$(MANPAGES_BASE))) LOCALES := $(foreach lang,$(LANGS),$(addprefix locale/$(lang)/,$(LOCALE_BASE))) @@ -117,7 +120,7 @@ $(InstallLocales) $(MAKE) -C plugins $@ -tar: rpmrebuild.spec man +tar: rpmrebuild.spec man expand tar -cvzf $(TAR_FILE) $(TAR_NAMES) dist: tar @@ -128,7 +131,7 @@ $@ -ba $(RPM_DEFINES) rpmrebuild.spec rpm --resign rpmrebuild*.rpm -clean: +clean: unexpand $(RMDIR) $(ROOT) $(RPM_BUILD_DIR) $(RM) VERSION rpmrebuild.spec *.rpm rpmrebuild.tar.gz rpmrebuild.tar.gz.sig $(RM) $(MANPAGES) @@ -139,8 +142,18 @@ html: ./faire_doc.sh +# build all packages alldist: rpmbuild dist html +# expand svn keywords just for publish +expand: + git tag -f "$(PACKAGE)-$(VERSION)" + git-svn-keyword-expand $(KEYWORD_FILES) + +# remove svn keywords to keep repository clean +unexpand: + git-svn-keyword-unexpand $(KEYWORD_FILES) + help: @echo "list of targets :" @echo "- tar : build tar.gz" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Release new/Release --- old/Release 2013-11-22 10:20:53.000000000 +0100 +++ new/Release 2017-09-10 15:27:24.000000000 +0200 @@ -1 +1 @@ -1 +2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Todo new/Todo --- old/Todo 2013-08-11 13:28:25.000000000 +0200 +++ new/Todo 2016-07-21 20:04:17.000000000 +0200 @@ -8,3 +8,6 @@ (detect passed signature with SIGGPG, ask for new one .) - add install option + +-------------------------------------------------------- +fix shell syntax with http://www.shellcheck.net/ 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 2013-08-14 18:12:01.000000000 +0200 +++ new/man/en/rpmrebuild.1.in 2017-09-10 15:19:11.000000000 +0200 @@ -53,10 +53,10 @@ \fB\-i, \-\-include\fP=<\fIfile\fP> read more options from the file 'file'. .TP -\fB\-I, \-\-install> -install the created package +\fB\-I, \-\-install\fP +install the created package. you need to run rpmrebuild as root user. .TP -\fB\-k, \-\-keep\-perm +\fB\-k, \-\-keep\-perm\fP alias to \fB\-\-pug\-from\-fs\fP .TP \fB\-l, \-\-list\-plugin\fP @@ -184,7 +184,7 @@ .LP \fB\-\-change\-spec\-pretrans\fP=<\fIcommand\fP> .br -\fB\-\-edit\-postrans +\fB\-\-edit\-pretrans .LP \fB\-\-change\-spec\-postrans\fP=<\fIcommand\fP> .br 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 2013-08-14 18:10:57.000000000 +0200 +++ new/man/fr_FR/rpmrebuild.1.in 2014-06-10 09:53:34.000000000 +0200 @@ -51,10 +51,10 @@ \fB\-i, \-\-include\fP=<\fIfile\fP> lit les options dans le fichier 'file' indiqu�. .TP -\fB\-I, \-\-install> +\fB\-I, \-\-install\fP installe le package cr�e .TP -\fB\-k, \-\-keep\-perm +\fB\-k, \-\-keep\-perm\fP alias de l'option \fB\-\-pug\-from\-fs\fP .TP \fB\-l, \-\-list\-plugin\fP @@ -182,7 +182,7 @@ .LP \fB\-\-change\-spec\-pretrans\fP=<\fIcommand\fP> .br -\fB\-\-edit\-postrans +\fB\-\-edit\-pretrans .LP \fB\-\-change\-spec\-postrans\fP=<\fIcommand\fP> .br 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 2013-08-14 18:10:40.000000000 +0200 +++ new/man/fr_FR.UTF-8/rpmrebuild.1.in 2014-06-10 09:53:34.000000000 +0200 @@ -51,10 +51,10 @@ \fB\-i, \-\-include\fP=<\fIfile\fP> lit les options dans le fichier 'file' indiqué. .TP -\fB\-I, \-\-install> +\fB\-I, \-\-install\fP installe le package crée .TP -\fB\-k, \-\-keep\-perm +\fB\-k, \-\-keep\-perm\fP alias de l'option \fB\-\-pug\-from\-fs\fP .TP \fB\-l, \-\-list\-plugin\fP @@ -182,7 +182,7 @@ .LP \fB\-\-change\-spec\-pretrans\fP=<\fIcommand\fP> .br -\fB\-\-edit\-postrans +\fB\-\-edit\-pretrans .LP \fB\-\-change\-spec\-postrans\fP=<\fIcommand\fP> .br diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/man/fr_FR.UTF-8/rpmrebuild_plugins.1.in new/man/fr_FR.UTF-8/rpmrebuild_plugins.1.in --- old/man/fr_FR.UTF-8/rpmrebuild_plugins.1.in 2011-09-27 13:45:06.000000000 +0200 +++ new/man/fr_FR.UTF-8/rpmrebuild_plugins.1.in 2017-09-10 15:19:53.000000000 +0200 @@ -154,7 +154,7 @@ set_tag.plug (change\-spec\-preamble) : un "vrai" plugin pour modifier la valeur d'un tag du fichier de spec .TP unset_tag.plug (change\-spec\-preamble) : un "vrai" plugin pour commnter un tag du fichier de spec -.SH "PLUGINS' CONVENTION DE NOMMAGE DES PAGES MAN" +.SH "CONVENTION DE NOMMAGE DES PAGES MAN de plugins" Si vous écrivez des plugin, vous êtes encouragés à suffixer les pages de manuel en \fB.1rrp\fP, afin que la commande \fB'man \-k rrp'\fP fournisse la liste des plugins pour rpmrebuild installés. Attention, la commande diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plugins/Makefile new/plugins/Makefile --- old/plugins/Makefile 2012-05-12 15:19:39.000000000 +0200 +++ new/plugins/Makefile 2017-09-10 15:19:11.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile 741 2012-05-12 13:19:38Z gerbier $ +# $Id$ TOP_DIR := .. include $(TOP_DIR)/Makefile.include diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plugins/compat_digest.plug new/plugins/compat_digest.plug --- old/plugins/compat_digest.plug 2009-11-11 21:33:49.000000000 +0100 +++ new/plugins/compat_digest.plug 2014-06-10 09:53:34.000000000 +0200 @@ -5,7 +5,7 @@ # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: compat_digest.plug 624 2009-11-11 20:33:41Z gerbier $ +# $Id$ # # 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/plugins/compat_digest.sh new/plugins/compat_digest.sh --- old/plugins/compat_digest.sh 2009-11-11 21:33:49.000000000 +0100 +++ new/plugins/compat_digest.sh 2014-06-10 09:53:34.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2004 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: compat_digest.sh 624 2009-11-11 20:33:41Z gerbier $ +# $Id$ # # 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/plugins/demo.plug new/plugins/demo.plug --- old/plugins/demo.plug 2013-07-27 17:52:08.000000000 +0200 +++ new/plugins/demo.plug 2014-06-10 09:53:34.000000000 +0200 @@ -5,7 +5,7 @@ # Copyright (C) 2004 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: demo.plug 831 2013-07-25 10:07:15Z valery_reznic $ +# $Id$ # # 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/plugins/demo.sh new/plugins/demo.sh --- old/plugins/demo.sh 2009-11-13 14:38:05.000000000 +0100 +++ new/plugins/demo.sh 2017-09-10 15:19:53.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2004 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: demo.sh 627 2009-11-13 13:38:02Z gerbier $ +# $Id$ # # 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 @@ ############################################################################### # code's file of demo plugin for rpmrebuild -version=1.1 +version=1.2 ############################################################################### function msg () { echo >&2 $* @@ -29,7 +29,7 @@ ############################################################################### function syntaxe () { msg "this plugin just show which spec part is changed by a plugin" - msg "it can be called with from any option" + msg "it must be called with a change-spec* option" msg "-n|--null : does nothing" msg "-h|--help : this help" msg "-v|--version : print plugin version" @@ -39,11 +39,12 @@ ############################################################################### # test for arguments -if [ $# -eq 1 ] -then +while [[ $1 ]] +do case $1 in -n | --null ) opt_null=y + shift ;; -h | --help ) @@ -60,17 +61,18 @@ syntaxe ;; esac -fi +done # test the way to be called case $LONG_OPTION in change-spec*) ;; - *) msg "bad option : $LONG_OPTION (should be called from change-spec*)"; + *) msg "bad call : $LONG_OPTION (should be called from change-spec*)"; syntaxe ;; esac +# modify spec file while read line do if [ -n "$opt_null" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plugins/demofiles.plug new/plugins/demofiles.plug --- old/plugins/demofiles.plug 2008-04-03 08:38:34.000000000 +0200 +++ new/plugins/demofiles.plug 2014-06-10 09:53:34.000000000 +0200 @@ -5,7 +5,7 @@ # Copyright (C) 2004 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: demofiles.plug 557 2008-04-02 08:33:52Z gerbier $ +# $Id$ # # 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/plugins/demofiles.sh new/plugins/demofiles.sh --- old/plugins/demofiles.sh 2008-04-03 08:27:39.000000000 +0200 +++ new/plugins/demofiles.sh 2017-09-10 15:19:53.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2004 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: demofiles.sh 565 2008-04-02 12:53:31Z gerbier $ +# $Id$ # # 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 @@ -23,7 +23,7 @@ # just a demo script to show what can be done # with a file plugin -version=1.0 +version=1.1 ############################################################################### function msg () { echo >&2 $* @@ -40,8 +40,8 @@ ############################################################################### # test for arguments -if [ $# -eq 1 ] -then +while [[ $ 1 ]] +do case $1 in -h | --help ) syntaxe @@ -57,7 +57,7 @@ syntaxe ;; esac -fi +done # test the way to be called case $LONG_OPTION in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plugins/file2pacDep.plug new/plugins/file2pacDep.plug --- old/plugins/file2pacDep.plug 2007-10-08 12:49:35.000000000 +0200 +++ new/plugins/file2pacDep.plug 2014-06-10 09:53:34.000000000 +0200 @@ -5,7 +5,7 @@ # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: file2pacDep.plug 381 2005-03-01 09:51:12Z valery_reznic $ +# $Id$ # # 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/plugins/file2pacDep.sh new/plugins/file2pacDep.sh --- old/plugins/file2pacDep.sh 2007-10-08 12:49:35.000000000 +0200 +++ new/plugins/file2pacDep.sh 2017-09-10 15:19:53.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: file2pacDep.sh 381 2005-03-01 09:51:12Z valery_reznic $ +# $Id$ # # 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 @@ -24,8 +24,9 @@ # for performance # frst search all motifs, then transform all with only one call -version=1.0 +version=1.1 +############################################################################### function analyse () { # build the list of file dependencies # without any version dependence @@ -95,7 +96,7 @@ ############################################################################### function syntaxe () { msg "this plugin transform all dependencies to files into dependencies to package" - msg "it can be called with : rpmrebuild --change-spec-requires" + msg "it must be called with : rpmrebuild --change-spec-requires" msg "-f|--file : just replace files (with path) by package" msg "-l|--lib : just replace lib file by packages" msg "-h|--help : this help" @@ -109,8 +110,8 @@ # default is to treat all dependencies opt_all=y # test for arguments -if [ $# -eq 1 ] -then +while [[ $1 ]] +do case $1 in -h | --help ) syntaxe @@ -123,16 +124,19 @@ -V | --forceversion ) opt_forceversion=y + shift ;; -f | --file ) opt_file=y; opt_all=''; + shift ;; -l | --lib ) opt_lib=y; opt_all=''; + shift ;; *) @@ -140,7 +144,7 @@ syntaxe ;; esac -fi +done # test the way to be called if [ "$LONG_OPTION" != "change-spec-requires" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plugins/nodoc.plug new/plugins/nodoc.plug --- old/plugins/nodoc.plug 2007-10-08 12:49:35.000000000 +0200 +++ new/plugins/nodoc.plug 2014-06-10 09:53:34.000000000 +0200 @@ -5,7 +5,7 @@ # Copyright (C) 2005 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: nodoc.plug 401 2005-05-20 09:42:52Z gerbier $ +# $Id$ # # 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/plugins/nodoc.sh new/plugins/nodoc.sh --- old/plugins/nodoc.sh 2007-10-08 12:49:35.000000000 +0200 +++ new/plugins/nodoc.sh 2017-09-10 15:19:53.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: nodoc.sh 410 2005-05-31 12:02:16Z gerbier $ +# $Id$ # # 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 @@ ############################################################################### # code's file of nodoc plugin for rpmrebuild -version=1.1 +version=1.2 ############################################################################### function msg () { @@ -30,11 +30,12 @@ ############################################################################### function syntaxe () { msg "this plugin remove documentation from package" - msg "it can be called with : rpmrebuild --change-spec-files" - msg "-m|--man : just remove man pages" - msg "-d|--doc : just remove doc files" + msg "it must be called with : rpmrebuild --change-spec-files" + msg "-m|--man : remove man pages" + msg "-d|--doc : remove doc files" msg "-h|--help : this help" msg "-v|--version : print plugin version" + msg "without option, remove doc and man files" exit 1 } @@ -43,8 +44,8 @@ # default is to treat all docs opt_all=y # test for arguments -if [ $# -eq 1 ] -then +while [[ $1 ]] +do case $1 in -h | --help ) syntaxe @@ -53,11 +54,13 @@ -m | --man ) opt_man=y opt_all='' + shift ;; -d | --doc ) opt_doc=y opt_all='' + shift ;; -v | --version ) @@ -70,8 +73,9 @@ syntaxe ;; esac -fi +done +# by default remove all if [ -n "$opt_all" ] then opt_man=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plugins/set_tag.plug new/plugins/set_tag.plug --- old/plugins/set_tag.plug 2008-04-03 08:30:03.000000000 +0200 +++ new/plugins/set_tag.plug 2014-06-10 09:53:34.000000000 +0200 @@ -5,7 +5,7 @@ # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: set_tag.plug 556 2008-04-02 08:33:28Z gerbier $ +# $Id$ # # 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/plugins/set_tag.sh new/plugins/set_tag.sh --- old/plugins/set_tag.sh 2008-04-03 08:25:26.000000000 +0200 +++ new/plugins/set_tag.sh 2017-09-10 15:19:53.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2004 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: set_tag.sh 556 2008-04-02 08:33:28Z gerbier $ +# $Id$ # # 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 @@ -20,7 +20,7 @@ # ############################################################################### -version=1.0 +version=1.1 ############################################################################### function msg () { echo >&2 $* @@ -41,35 +41,37 @@ # test for arguments if [ $# -ne 0 ] then - case $1 in - -t | --tag ) - opt_tag=$2 - opt_val=$3 - ;; - - -h | --help ) - syntaxe - ;; - - -v | --version ) - msg "$0 version $version"; - exit 1; - ;; - - *) - msg "bad option : $1"; - syntaxe - ;; - esac -else + while [[ $1 ]] + do + case $1 in + -t | --tag ) + opt_tag=$2 + opt_val=$3 + shift 3 + ;; + + -h | --help ) + syntaxe + ;; + + -v | --version ) + msg "$0 version $version"; + exit 1; + ;; + + *) + msg "bad option : $1"; + syntaxe + ;; + esac + done +elif [ -n "$TAG_ID" ] +then # we can also provide value by environment - if [ -n "$TAG_ID" ] - then - opt_tag=$TAG_ID - opt_val=$TAG_VAL - else - syntaxe - fi + opt_tag=$TAG_ID + opt_val=$TAG_VAL +else + syntaxe fi # test the way to be called diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plugins/un_prelink.plug new/plugins/un_prelink.plug --- old/plugins/un_prelink.plug 2012-05-17 17:01:35.000000000 +0200 +++ new/plugins/un_prelink.plug 2014-06-10 09:53:34.000000000 +0200 @@ -5,7 +5,7 @@ # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: un_prelink.plug 744 2012-05-15 09:41:43Z gerbier $ +# $Id$ # # 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/plugins/un_prelink.sh new/plugins/un_prelink.sh --- old/plugins/un_prelink.sh 2012-05-17 17:01:35.000000000 +0200 +++ new/plugins/un_prelink.sh 2014-06-10 09:53:34.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2004 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: un_prelink.sh 744 2012-05-15 09:41:43Z gerbier $ +# $Id$ # # 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/plugins/uniq.plug new/plugins/uniq.plug --- old/plugins/uniq.plug 2007-10-08 12:49:35.000000000 +0200 +++ new/plugins/uniq.plug 2014-06-10 09:53:34.000000000 +0200 @@ -5,7 +5,7 @@ # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: uniq.plug 381 2005-03-01 09:51:12Z valery_reznic $ +# $Id$ # # 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/plugins/uniq.sh new/plugins/uniq.sh --- old/plugins/uniq.sh 2007-10-08 12:49:35.000000000 +0200 +++ new/plugins/uniq.sh 2017-09-10 15:19:53.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: uniq.sh 381 2005-03-01 09:51:12Z valery_reznic $ +# $Id$ # # 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 @@ ############################################################################### # code's file of uniq plugin for rpmrebuild -version=1.0 +version=1.1 ############################################################################### function msg () { echo >&2 $* @@ -29,7 +29,7 @@ ############################################################################### function syntaxe () { msg "this plugin remove duplicate spec lines" - msg "it can be called with : rpmrebuild --change-spec-requires|--change-spec-provides|--change-spec-conflicts|--change-spec-obsoletes" + msg "it must be called with : rpmrebuild --change-spec-requires|--change-spec-provides|--change-spec-conflicts|--change-spec-obsoletes" msg "-h|--help : this help" msg "-v|--version : print plugin version" exit 1 @@ -38,8 +38,8 @@ ############################################################################### # test for arguments -if [ $# -eq 1 ] -then +while [[ $1 ]] +do case $1 in -h | --help ) syntaxe @@ -55,7 +55,7 @@ syntaxe ;; esac -fi +done # test the way to be called case $LONG_OPTION in @@ -70,7 +70,6 @@ ;; esac -liste="" while read line do echo $line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plugins/unset_tag.plug new/plugins/unset_tag.plug --- old/plugins/unset_tag.plug 2012-05-17 17:01:35.000000000 +0200 +++ new/plugins/unset_tag.plug 2014-06-10 09:53:34.000000000 +0200 @@ -5,7 +5,7 @@ # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: unset_tag.plug 744 2012-05-15 09:41:43Z gerbier $ +# $Id$ # # 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/plugins/unset_tag.sh new/plugins/unset_tag.sh --- old/plugins/unset_tag.sh 2012-05-17 17:01:35.000000000 +0200 +++ new/plugins/unset_tag.sh 2017-09-10 15:19:53.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2004 by Eric Gerbier # Bug reports to: [email protected] # or : [email protected] -# $Id: unset_tag.sh 744 2012-05-15 09:41:43Z gerbier $ +# $Id$ # # 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 @@ -20,7 +20,7 @@ # ############################################################################### -version=1.0 +version=1.1 ############################################################################### function msg () { echo >&2 $* @@ -41,33 +41,35 @@ # test for arguments if [ $# -ne 0 ] then - case $1 in - -t | --tag ) - opt_tag=$2 - ;; - - -h | --help ) - syntaxe - ;; - - -v | --version ) - msg "$0 version $version"; - exit 1; - ;; - - *) - msg "bad option : $1"; - syntaxe - ;; - esac -else + while [[ $1 ]] + do + case $1 in + -t | --tag ) + opt_tag=$2 + shift 2 + ;; + + -h | --help ) + syntaxe + ;; + + -v | --version ) + msg "$0 version $version"; + exit 1; + ;; + + *) + msg "bad option : $1"; + syntaxe + ;; + esac + done +elif [ -n "$TAG_ID" ] +then # we can also provide value by environment - if [ -n "$TAG_ID" ] - then - opt_tag=$TAG_ID - else - syntaxe - fi + opt_tag=$TAG_ID +else + syntaxe fi # test the way to be called diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/processing_func.src new/processing_func.src --- old/processing_func.src 2013-07-27 17:52:08.000000000 +0200 +++ new/processing_func.src 2017-09-10 15:29:36.000000000 +0200 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2004 by Valery Reznic # This file is a part of the rpmrebuild project -# $Id: processing_func.src 831 2013-07-25 10:07:15Z valery_reznic $ +# $Id: rpmrebuild-2.11 | processing_func.src | Thu Jul 25 10:07:15 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 new/rpmrebuild --- old/rpmrebuild 2012-05-17 17:04:51.000000000 +0200 +++ new/rpmrebuild 2017-09-10 15:29:36.000000000 +0200 @@ -4,7 +4,7 @@ # # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] -# $Id: rpmrebuild 749 2012-05-17 15:04:50Z gerbier $ +# $Id: rpmrebuild-2.11 | 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 2013-11-22 10:20:35.000000000 +0100 +++ new/rpmrebuild.lsm 2017-09-10 15:29:06.000000000 +0200 @@ -1,7 +1,7 @@ Begin4 Title: rpmrebuild Version: 2.11 -Entered-date: 2013-11-22 +Entered-date: 2017-09-10 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.3-1rpm.noarch.rpm + 90 ko rpmrebuild-2.11-2.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 2013-08-23 08:55:34.000000000 +0200 +++ new/rpmrebuild.sh 2017-09-10 15:29:36.000000000 +0200 @@ -4,7 +4,7 @@ # # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] -# $Id: rpmrebuild.sh 855 2013-08-20 11:19:59Z gerbier $ +# $Id: rpmrebuild-2.11 | 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.sh 855 2013-08-20 11:19:59Z gerbier $" +VERSION="$Id: rpmrebuild-2.11 | 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 2012-07-11 19:01:09.000000000 +0200 +++ new/rpmrebuild.spc 2017-09-10 15:21:03.000000000 +0200 @@ -31,7 +31,7 @@ %else # rpm v4 v5 -Requires: /usr/bin/rpmbuild +Requires: rpm-build Requires: coreutils %define release_suffix %{release} %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.spec new/rpmrebuild.spec --- old/rpmrebuild.spec 2013-11-22 10:31:41.000000000 +0100 +++ new/rpmrebuild.spec 2017-09-10 15:27:33.000000000 +0200 @@ -1,5 +1,5 @@ Version: 2.11 -%define release 1 +%define release 2 # get rpm version %define rpm_ver %( rpm -q --queryformat='%{VERSION}' rpm | cut -f 1 -d.) # test for an rpm version @@ -33,7 +33,7 @@ %else # rpm v4 v5 -Requires: /usr/bin/rpmbuild +Requires: rpm-build Requires: coreutils %define release_suffix %{release} %endif @@ -75,13 +75,17 @@ %files -f rpmrebuild.files %changelog -* Wed Nov 22 2013 <[email protected]> 2.11 +* 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 + +* Fri Nov 22 2013 <[email protected]> 2.11 - add install option * Sun Aug 11 2013 <[email protected]> 2.10-2 - bugfix from 2.10 on test install : test was inverted (applied on rpm files instead installed rpm) -* Tue Aug 01 2013 <[email protected]> 2.10 +* Thu Aug 01 2013 <[email protected]> 2.10 - add tag DISTTAG (feature request) - do not test install if work on rpm files - applied patch from Olivier Bourdon for pretrans and postrans @@ -89,12 +93,12 @@ * Sun Jan 13 2013 <[email protected]> 2.9 - fix to work with rpm 4.10 (Fedora 18) - error: incorrect format: invalid field width -* Thu Jul 11 2012 <[email protected]> 2.8 +* Wed Jul 11 2012 <[email protected]> 2.8 - can handle SUGGESTS/ENHANCES rpm tag - add --cap-from-fs/cap-from-db options - build rpmrebuild-version.tar.gz to allow rpmbuild -tb work -* Thu Jun 06 2012 <[email protected]> 2.7 +* Wed Jun 06 2012 <[email protected]> 2.7 - patch from Andreas Kainz for package file checking - add new unset_tag plugin - add support for rpm version 5 (mandriva) @@ -119,10 +123,10 @@ * Fri Dec 11 2009 <[email protected]> 2.4 - add -l / --list-plugin option -* Tue Nov 12 2009 <[email protected]> +* Thu Nov 12 2009 <[email protected]> - add -5 / --md5-compat-digest option -* Wed Jan 09 2009 <[email protected]> 2.3 +* Fri Jan 09 2009 <[email protected]> 2.3 - release version 2.3 * Tue Dec 16 2008 <[email protected]> @@ -131,7 +135,7 @@ * Tue Dec 16 2008 <[email protected]> - fix for rpm 4.6 (fedora 10), that ignore BuildRoot in the spec file flag -* Wed Dec 05 2008 <[email protected]> +* Fri Dec 05 2008 <[email protected]> - do not use popt any more * Wed Aug 06 2008 <[email protected]> 2.2.3-1 @@ -203,18 +207,18 @@ * Sun Nov 14 2004 <[email protected]> 2.0.0-1 - rpmrebuild_parser.src - added '--help-plugins' option -* Wed Oct 26 2004 <[email protected]> 2.0.0-1 +* Tue Oct 26 2004 <[email protected]> 2.0.0-1 - processing of /change/modify/edit was moved to the processng_func.src - changes to support --change-spec-* ane --edit-* (in the processing_func, rpmrebuild_popt and rpmrebuild_parser) - added '--include' option -* Wed Sep 28 2004 <[email protected]> 2.0.0-1 +* Tue Sep 28 2004 <[email protected]> 2.0.0-1 - changed all env variables' names to be prefixed with RPMREBUILD_ -* Tue Sep 27 2004 <[email protected]> 2.0.0-1 +* Mon Sep 27 2004 <[email protected]> 2.0.0-1 - change different variables values from empty/non-empty to yes/no -* Tue Sep 20 2004 <[email protected]> 2.0.0-1 +* Mon Sep 20 2004 <[email protected]> 2.0.0-1 - Added support for arbitrary execution order for change/edit/modify * Sun Sep 19 2004 <[email protected]> 2.0.0-1 @@ -297,39 +301,39 @@ * Fri Jan 17 2003 <[email protected]> 1.4.0-1 - public release of 1.3 dev branch -* Mon Dec 29 2002 <[email protected]> 1.3-1 +* Sun Dec 29 2002 <[email protected]> 1.3-1 - add '-p' option. Now is possible rebuild not only installed rpm, but rpm file too. May be usefull with '-e' or '--filter' option -* Mon Dec 18 2002 <[email protected]> 1.3-1 +* Wed Dec 18 2002 <[email protected]> 1.3-1 - more simple and robust filter * Thu Dec 12 2002 <[email protected]> 1.3.1 - add filter option for "pluggins" - rewrite --resolv-dep as pluggin -* Mon Dec 10 2002 <[email protected]> 1.3-0 +* Tue Dec 10 2002 <[email protected]> 1.3-0 - change long options name to be more consistant - added support for %%lang -* Mon Dec 10 2002 <[email protected]> 1.3.0 +* Tue Dec 10 2002 <[email protected]> 1.3.0 - add man page - fix bug with % in changelog - add -r|--resolv-dep option - add french translation in specfile -* Sat Dec 3 2002 <[email protected]> 1.3.0 +* Tue Dec 3 2002 <[email protected]> 1.3.0 - added long options -* Sat Dec 2 2002 <[email protected]> 1.2-0 +* Mon Dec 2 2002 <[email protected]> 1.2-0 - now rpmrebuild can be run as 'rpm --rpmrebuild' -* Sat Nov 24 2002 <[email protected]> 1.1-1 +* Sun Nov 24 2002 <[email protected]> 1.1-1 - filter "(none)" answer from rpm the scripts queries * Sat Nov 23 2002 <[email protected]> 1.1-0 - filter "(none)" answer from rpm queries -* Thu Oct 22 2002 <[email protected]> 1.0-0 +* Tue Oct 22 2002 <[email protected]> 1.0-0 - replace vi by %%define - add command lines options (-h : help, -v : verbose, -V: version) - add lsm description @@ -364,18 +368,18 @@ - add triggers (thanks to Han Holl <[email protected]> - add many other spec tags (icon, exlude*, serial, provides, conflicts ...) -* Sun Sep 20 2002 <[email protected]> 0.5.0 +* Fri Sep 20 2002 <[email protected]> 0.5.0 - try to have it work on any distribution - the rpm package is now signed with my gpg key -* Mon Sep 17 2002 <[email protected]> 0.4.2 +* Tue Sep 17 2002 <[email protected]> 0.4.2 - add architecture support (thanks to Han Holl <[email protected]>) - add add require, obsolete tags - force time format with LC_TIME to POSIX - change shell name to match project name - full english messages -* Mon Sep 17 2002 <[email protected]> 0.4.1 +* Tue Sep 17 2002 <[email protected]> 0.4.1 - suppress useless exit - shell cosmetic changes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_buildroot.sh new/rpmrebuild_buildroot.sh --- old/rpmrebuild_buildroot.sh 2013-01-17 18:10:19.000000000 +0100 +++ new/rpmrebuild_buildroot.sh 2017-09-10 15:29:36.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2002, 2003, 2013 by Valery Reznic # Bug reports to: [email protected] # or : [email protected] -# $Id: rpmrebuild_buildroot.sh 825 2013-01-14 12:35:18Z valery_reznic $ +# $Id: rpmrebuild-2.11 | 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 2012-02-17 16:48:55.000000000 +0100 +++ new/rpmrebuild_extract_tags.sh 2017-09-10 15:29:36.000000000 +0200 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] -# $Id: rpmrebuild_extract_tags.sh 720 2012-02-14 09:30:42Z gerbier $ +# $Id: rpmrebuild-2.11 | 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 2013-01-17 18:10:19.000000000 +0100 +++ new/rpmrebuild_files.sh 2017-09-10 15:29:36.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2002, 2003, 2013 by Valery Reznic # Bug reports to: [email protected] # or : [email protected] -# $Id: rpmrebuild_files.sh 825 2013-01-14 12:35:18Z valery_reznic $ +# $Id: rpmrebuild-2.11 | 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 2013-01-17 18:10:19.000000000 +0100 +++ new/rpmrebuild_ghost.sh 2017-09-10 15:29:36.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2002, 2003, 2013 by Valery Reznic # Bug reports to: [email protected] # or : [email protected] -# $Id: rpmrebuild_ghost.sh 825 2013-01-14 12:35:18Z valery_reznic $ +# $Id: rpmrebuild-2.11 | 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 2012-07-07 10:06:41.000000000 +0200 +++ new/rpmrebuild_lib.src 2017-09-10 15:29:36.000000000 +0200 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2011 by Eric Gerbier # This file is a part of the rpmrebuild project -# $Id: spec_func.src 626 2009-11-12 14:42:49Z valery_reznic $ +# $Id: rpmrebuild-2.11 | 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 2013-08-23 08:55:34.000000000 +0200 +++ new/rpmrebuild_parser.src 2017-09-10 15:29:36.000000000 +0200 @@ -3,7 +3,7 @@ # # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] -# $Id: rpmrebuild_parser.src 855 2013-08-20 11:19:59Z gerbier $ +# $Id: rpmrebuild-2.11 | rpmrebuild_parser.src | 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_rpmqf.src new/rpmrebuild_rpmqf.src --- old/rpmrebuild_rpmqf.src 2013-07-27 17:52:08.000000000 +0200 +++ new/rpmrebuild_rpmqf.src 2017-09-10 15:29:36.000000000 +0200 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] -# $Id: rpmrebuild_rpmqf.src 831 2013-07-25 10:07:15Z valery_reznic $ +# $Id: rpmrebuild-2.11 | rpmrebuild_rpmqf.src | Thu Jul 25 10:07:15 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/spec_func.src new/spec_func.src --- old/spec_func.src 2013-07-27 17:52:08.000000000 +0200 +++ new/spec_func.src 2017-09-10 15:29:36.000000000 +0200 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2004, 2009 by Valery Reznic # This file is a part of the rpmrebuild project -# $Id: spec_func.src 831 2013-07-25 10:07:15Z valery_reznic $ +# $Id: rpmrebuild-2.11 | spec_func.src | Thu Jul 25 10:07:15 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 ++++++ rpmrebuild-2.11.tar.gz.sig ++++++ --- /var/tmp/diff_new_pack.i1YsZ2/_old 2017-09-17 22:40:08.045425059 +0200 +++ /var/tmp/diff_new_pack.i1YsZ2/_new 2017-09-17 22:40:08.049424497 +0200 @@ -1,7 +1,16 @@ -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.15 (GNU/Linux) -iD8DBQBSjySDNzh6q8tvpCoRAkh4AKCDKn+F8Ys5nEWfgZPSo3k2+25xNACcCfPD -rWTFUDqdTS4GF2h50nAwaY8= -=0ZbM +iQIcBAABAgAGBQJZtT5CAAoJEPUsiFrW96VqAPwQAKohuz71tHUamAWZDKdIZnJ3 +Pwz+NLzgxU4aJnU1v/1c/6nDc44S5FRiYCcPt1loQyF4sT3qN+9H1H435rICe1ia +8Tr9HALfhO4hIKQZm5bLWimbwriIMmjtCTAgZQgqMmQMIIbfoNO9DIgQXgphsFAd +JBTHHlQ982igDHSpqrqmSxEU5yDIwX59bSrK5rcH+/iR0MawIdsOuIvXToooCpFT +9FncivuKnJa6cmEg8Jfh7hCaJw+lkUO0+V2orBEFnFpFJbVX6VSHQQRBTau54++Y +5woUwPhOjOSCaylq5ERRHv4deBiaJ459up9fKtc4WyFixSoeWHVy/eRJV0GNI6pw +J3oa7rqfjpvcZI92ujAicGnPC40emf3dMFoS1O2YLkpFSxaswpckAWFZFx8k9VPX +SJ7xFOMZfqFWYj7r3Eve7xKOc8jVC5AlxdEzy+bc47InyJxKgxvvwGYRNb7MQoPC +kSbFEozBsaBk73pRZZErt1RZVDs1bbLfpvHGegHeG/1wtYOkqkqM79TUzMpp7hYd +JEkBQRW95RBw3mb1xrcZEPm7bCb/5b7nyCkBuyqJHvUZQSYtcj6CqYQ+zN1+c3he +Kml76jC+TpUXyAcdk0AfL+8buxi/lWsZQdHriZdRiz0I9ThntoPGLX0ik2CCva89 +LX6VWlSBdDPIdVvX55HA +=P4kZ -----END PGP SIGNATURE----- ++++++ rpmrebuild-fix-bashisms.patch ++++++ --- /var/tmp/diff_new_pack.i1YsZ2/_old 2017-09-17 22:40:08.065422247 +0200 +++ /var/tmp/diff_new_pack.i1YsZ2/_new 2017-09-17 22:40:08.069421685 +0200 @@ -1,17 +1,17 @@ -diff -Ndur rpmrebuild/plugins/demofiles.sh rpmrebuild-fix-bashisms/plugins/demofiles.sh ---- rpmrebuild/plugins/demofiles.sh 2008-04-03 09:27:39.000000000 +0300 -+++ rpmrebuild-fix-bashisms/plugins/demofiles.sh 2014-12-28 15:58:30.290727796 +0200 +diff -Ndur a/plugins/demofiles.sh b/plugins/demofiles.sh +--- a/plugins/demofiles.sh 2017-09-16 11:54:46.161483014 +0200 ++++ b/plugins/demofiles.sh 2017-09-16 11:56:41.910200886 +0200 @@ -25,11 +25,11 @@ # with a file plugin - version=1.0 + version=1.1 ############################################################################### -function msg () { -+msg() { ++msg () { echo >&2 $* } ############################################################################### -function syntaxe () { -+syntaxe() { ++syntaxe () { msg "this plugin just show how to modifiy files" msg "it must be called with --change-files option" msg "-h|--help : this help" ++++++ rpmrebuild.keyring ++++++ --- /var/tmp/diff_new_pack.i1YsZ2/_old 2017-09-17 22:40:08.093418311 +0200 +++ /var/tmp/diff_new_pack.i1YsZ2/_new 2017-09-17 22:40:08.093418311 +0200 @@ -1,9 +1,5 @@ -pub 1024D/CB6FA42A 2000-01-24 -uid Eric Gerbier <[email protected]> -uid Eric Gerbier <[email protected]> -sub 1024g/11A58047 2000-01-24 - -----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 mQGiBDiME6sRBADJ8UHnF6QoOyHpxTXIGGfR9D29Eqa8eLS+/21wkW7b9bxiwxuR j4Gle3wpoAL2gQaFd6XUEWCmK30XxaXBGuHcs8y5j+L/5XCi0TYZmjXaM4iCvr9V @@ -13,19 +9,64 @@ OeXZilRgpOLMwehGHXV5Tr4otDcncvyOeZdK/BMRN4qQu+JumAg4LrzlhuCU/mJB s81xBADEELbi5b7np59QKnttJjS8CWYPX/S8L+ZRcWdmVb7ZUPvq61MHfbWGHcy9 EawEzNVe9mSpx3zLRBA7rBOrK6y+RE7F+q+VeUcjuD3zpFi4PL7pQgMc7n6wzlN/ -1q4+f9rkFaEf4PSYDH2lGw9wa56fogzYFzMwUcTAo4cSRIJht7QkRXJpYyBHZXJi -aWVyIDxlcmljLmdlcmJpZXJAbWV0ZW8uZnI+iFUEExECABUFAjiME6sDCwoDAxUD -AgMWAgECF4AACgkQNzh6q8tvpCpR4gCfbAXqIwSt3FwLI0Smx8OdiZPlYiwAnj7i -yTbvSRFOiP2EsfjeAE+GkxTPtCxFcmljIEdlcmJpZXIgPGdlcmJpZXJAdXNlcnMu -c291cmNlZm9yZ2UubmV0PohXBBMRAgAXBQI9kHRTBQsHCgMEAxUDAgMWAgECF4AA -CgkQNzh6q8tvpCrqmACePb3TmZMjNYXASHUojoUZWS0WkYwAn0ZYj5Hz5fTjBAwb -foa9STgnfCqIuQENBDiME78QBADRuWfo/WubYn2E5V/fCvbaCUq2OKsW/2qfudFe -OXr/Z3T2bE2ZayvpFUBVo/psvCP1MgWqQYXzaibZxnfstQ7Z00nBmRemIsMPdBPa -PMZr00SSSeb22MF3JlTTvUYilqVDnekwHs3X+Jm8iPL3VnfdpDqEw/uXJIOY0hry -Cl2+rwADBQQAwiqCqeB1zTNgrAWyoBgycTVjEAsKN0ruyvh5ipVSXNSxj8jsHAko -6bWcbf0KsXcHusYsHH8JNp0Evx9f00vj8WYNCgLCQDkUdvLoGegGDXvumttj+Q9u -gx5vlx9wE0CQsaZCrMqyZgbQu+HwRot/JTG9Unl3PfuCbXbGfunnAB+IRgQYEQIA -BgUCOIwTvwAKCRA3OHqry2+kKpjaAJ9MxFc4OQ/rl+6laUCyKSwGds88wgCdHvHd -+DnoAOyps+JV8EodJbMH+mc= -=4LhY +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 +=D16O -----END PGP PUBLIC KEY BLOCK-----
