Hello community,
here is the log from the commit of package rpmrebuild for openSUSE:Factory
checked in at Mon Aug 10 18:28:40 CEST 2009.
--------
--- rpmrebuild/rpmrebuild.changes 2008-09-08 14:53:00.000000000 +0200
+++ rpmrebuild/rpmrebuild.changes 2009-08-05 13:09:36.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Aug 5 13:06:12 CEST 2009 - hvogel@suse.de
+
+- Update to version 2.3
+ o fix installation test when repackaged rpm file (with -p)
+ o fix for rpm 4.6 that ignore BuildRoot in the spec file flag
+ o do not use popt any more
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
rpmrebuild-2.2.3.tar.bz2
New:
----
rpmrebuild-2.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpmrebuild.spec ++++++
--- /var/tmp/diff_new_pack.et22yj/_old 2009-08-10 18:28:27.000000000 +0200
+++ /var/tmp/diff_new_pack.et22yj/_new 2009-08-10 18:28:27.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package rpmrebuild (Version 2.2.3)
+# spec file for package rpmrebuild (Version 2.3)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
License: GPL v2 or later
Group: System/Packages
AutoReqProv: on
-Version: 2.2.3
+Version: 2.3
Release: 1
Summary: A tool to build a rpm file from the rpm database
Url: http://rpmrebuild.sourceforge.net
++++++ rpmrebuild-2.2.3.tar.bz2 -> rpmrebuild-2.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Changelog new/Changelog
--- old/Changelog 2008-08-07 08:17:47.000000000 +0200
+++ new/Changelog 2009-01-09 10:41:37.000000000 +0100
@@ -1,3 +1,15 @@
+* Wed Jan 09 2009 2.3
+- release version 2.3
+
+* Tue Dec 16 2008
+- fix a problem: installation test failed when repackaged rpm file (with -p)
+
+* Tue Dec 16 2008
+- fix for rpm 4.6 (fedora 10), that ignore BuildRoot in the spec file flag
+
+* Wed Dec 05 2008
+- do not use popt any more
+
* Wed Aug 06 2008 2.2.3-1
- fix a problem with new rpm security on mandriva (defaultbuildroot)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Makefile new/Makefile
--- old/Makefile 2007-10-09 12:57:31.000000000 +0200
+++ new/Makefile 2008-12-19 09:05:02.000000000 +0100
@@ -1,3 +1,5 @@
+# $Id: Makefile 609 2008-12-14 16:30:40Z valery_reznic $
+#
TOP_DIR := .
include $(TOP_DIR)/Makefile.include
@@ -25,22 +27,18 @@
rpmrebuild_files.sh \
rpmrebuild_buildroot.sh \
rpmrebuild_ghost.sh \
- run.sh
INCLUDE_SCRIPTS := \
processing_func.src \
+ rpmrebuild_rpmqf.src \
rpmrebuild_parser.src \
- spec_func.src
+ spec_func.src \
-POPTS := \
- rpmrebuild_popt \
- popt-without-POPTdesc \
- popt-with-POPTdesc \
-
-SPEC_SCRIPTS := \
- spec.scripts.input \
- spec.scripts.make.sh \
- remove_from_popt.make.include \
+PERLS := \
+ extract_tags.pl \
+
+DATA := \
+ rpmrebuild.usedtags \
MANPAGES_BASE := \
rpmrebuild.1 \
@@ -70,10 +68,10 @@
$(SCRIPTS) \
$(LIB_SCRIPTS) \
$(INCLUDE_SCRIPTS) \
- $(POPTS) \
+ $(PERLS) \
$(SPEC_SCRIPTS) \
$(MANPAGES_SRC) \
- $(LOCALES) \
+ $(LOCALES) \
$(DOC_FILES) \
Makefile \
Makefile.include \
@@ -93,28 +91,26 @@
echo "Version: $$Version" && \
echo "%define release $$Release" && \
cat rpmrebuild.spc && \
- cat spec.scripts && \
echo "%changelog" && \
cat Changelog && \
: ; \
}
endef
-all: rpmrebuild.spec VERSION $(MANPAGES)
- $(LN) rpmrebuild_popt .popt
+all: rpmrebuild.spec VERSION $(MANPAGES) $(DATA)
$(MAKE) -C plugins $@
-rpmrebuild.spec: rpmrebuild.spc spec.scripts Version Release Changelog
+rpmrebuild.usedtags: extract_tags.pl rpmrebuild_rpmqf.src
+ $(RM) $@
+ perl $^ > $@ || { $(RM) $@; exit 1; }
+
+rpmrebuild.spec: rpmrebuild.spc Version Release Changelog
$(RM) $@
$(Spec) > $@ || { $(RM) $@; exit 1; }
$(MANPAGES): %: %.in $(TOP_DIR)/Version
$(MakeManPage)
-spec.scripts:
- $(RM) $@
- /bin/sh spec.scripts.make.sh < $@.input > $@ || { $(RM) $@; exit 1; }
-
VERSION: Version
$(RM) $@
read VERSION < $< && echo "VERSION='$$VERSION'" > $@ || { $(RM) $@; exit 1; }
@@ -123,11 +119,9 @@
$(MKDIR) $(TARGET_DIR)
$(INSTALL_RUN) $(SCRIPTS) $(TARGET_DIR)
- $(MKDIR) $(TARGET_LIB)
- $(INSTALL_RUN) $(LIB_SCRIPTS) $(TARGET_LIB)
- $(INSTALL_RO) $(INCLUDE_SCRIPTS) VERSION $(TARGET_LIB)
- $(INSTALL_RO) $(POPTS) $(TARGET_LIB)
- cd $(TARGET_LIB) && $(LN) rpmrebuild_popt .popt
+ $(MKDIR) $(TARGET_LIB)
+ $(INSTALL_RUN) $(LIB_SCRIPTS) $(TARGET_LIB)
+ $(INSTALL_RO) $(INCLUDE_SCRIPTS) $(DATA) VERSION $(TARGET_LIB)
$(InstallManPages)
$(InstallLocales)
$(MAKE) -C plugins $@
@@ -135,17 +129,16 @@
tar: rpmrebuild.spec man
tar -cvzf $(TAR_FILE) $(TAR_NAMES)
-rpm rpmbuild: tar
+rpmbuild: tar
$(MKDIR) $(RPM_BUILD_DIR)
$@ -ba $(RPM_DEFINES) rpmrebuild.spec
- export RPMOLD=y && $@ -ba $(RPM_DEFINES) rpmrebuild.spec
rpm --resign rpmrebuild*.rpm
clean:
$(RMDIR) $(ROOT) $(RPM_BUILD_DIR)
- $(RM) VERSION rpmrebuild.spec spec.scripts *.rpm rpmrebuild.tar.gz
- $(RM) .popt
+ $(RM) VERSION rpmrebuild.spec *.rpm rpmrebuild.tar.gz
$(RM) $(MANPAGES)
+ $(RM) $(DATA)
$(MAKE) -C plugins $@
man: $(MANPAGES)
@@ -154,6 +147,5 @@
@echo "list of targets :"
@echo "- tar : build tar.gz"
@echo "- rpmbuild : build rpm packages with rpm 4.x release"
- @echo "- rpm : build rpm packages with rpm 3.x release (deprecated)"
@echo "- install : install software"
@echo "- man : build man pages"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/News new/News
--- old/News 2008-08-07 08:17:47.000000000 +0200
+++ new/News 2009-01-09 10:41:21.000000000 +0100
@@ -1,3 +1,4 @@
+* 2009-01-09 : release 2.2.3-1, do not use popt any more, fix problem with rpm 4.6 (fedora10), that ignore BuildRoot
* 2008-08-06 : release 2.2.3-1, fix a problem with new rpm security on mandriva (defaultbuildroot)
* 2008-04-28 : release 2.2.2-1, fix bug when working on package file with path
* 2008-04-02 : release 2.2.1-1, utf-8, set_tag and demofiles plugin, bugfix on %attr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Version new/Version
--- old/Version 2008-07-15 16:06:38.000000000 +0200
+++ new/Version 2009-01-09 10:33:05.000000000 +0100
@@ -1 +1 @@
-2.2.3
+2.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extract_tags.pl new/extract_tags.pl
--- old/extract_tags.pl 1970-01-01 01:00:00.000000000 +0100
+++ new/extract_tags.pl 2008-12-11 17:31:18.000000000 +0100
@@ -0,0 +1,44 @@
+#!/usr/bin/perl
+###############################################################################
+# Copyright (C) 2002 by Eric Gerbier
+# Bug reports to: gerbier@users.sourceforge.net
+# $Id: extract_tags.pl 601 2008-12-08 15:24:21Z 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
+# 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.
+#
+###############################################################################
+# this script is used to extract all rpm tags used in rpmrebuild_rpmqf.src
+# and to display a sorted list
+###############################################################################
+use strict;
+use warnings;
+
+my %tags;
+
+my $fh;
+if (open $fh, '<', 'rpmrebuild_rpmqf.src') {
+ while (<$fh>) {
+ chomp;
+ while ( m/\%\{([\w:]+)\}/g ) {
+ my ($tag, undef) = split /:/, $1;
+ $tags{$tag} = 1;
+ }
+ }
+
+ close $fh;
+
+} else {
+ die "can not open rpmrebuild_rpmqf.src : $!\n";
+}
+
+foreach my $k (sort keys %tags ) {
+ print "$k\n";
+}
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 2007-10-26 11:30:23.000000000 +0200
+++ new/man/en/rpmrebuild.1.in 2009-01-09 11:25:12.000000000 +0100
@@ -3,10 +3,6 @@
rpmrebuild \- a tool to build an rpm package from an installed package
.SH "SYNOPSIS"
rpmrebuild [\fIoption\fP] <\fIpackagename\fP>
-.br
-or
-.br
-rpm \-\-rpmrebuild [\fIoption\fP] <\fIpackagename\fP>
.SH "DESCRIPTION"
rpmrebuild is a tool to build easily rpm package.
it can be used to build an rpm file from an installed package (lost rpm) or
@@ -224,9 +220,6 @@
\fB~/.rpmmacros\fP
is used by rpm when building packages (macros)
.TP
-\fB/etc/popt\fP
-contains rpm alias used by rpmrebuild
-.TP
\fB$RPMREBUILD_TMPDIR/work\fP
directory where rpmrebuild put temporary files.
.SH "ENVIRONMENT"
@@ -244,39 +237,43 @@
.LP
Build an rpm package as closed as possible to original one:
.LP
-\fBrpm \-\-rpmrebuild \-\-batch package\fP
+\fBrpmrebuild \-\-batch package\fP
.LP
Build a modified package:
.LP
-\fBrpm \-\-rpmrebuild \-\-keep\-perm package\fP
+\fBrpmrebuild \-\-keep\-perm package\fP
.LP
Build a rpm from another rpm file:
.LP
-\fBrpm \-\-rpmrebuild \-\-package \-\-filter filter /usr/src/redhat/i386/package\-i386.rpm\fP
+\fBrpmrebuild \-\-package \-\-filter filter /usr/src/redhat/i386/package\-i386.rpm\fP
+.LP
+rebuild and sign the bash package
+.LP
+\fBrpmrebuild \-\-additional "\-\-sign" bash\fP
.LP
Rebuild rpm as legacy (rpm[23]) package:
.LP
-\fBrpm \-\-rpmrebuild \-\-additional "\-\-nodirtokens" bash\fP
+\fBrpmrebuild \-\-additional "\-\-nodirtokens" bash\fP
.LP
Specify generated rpm name:
.LP
-\fBrpm \-\-rpmrebuild \-\-define "_rpmfilename %%{NAME}.rpm" bash\fP
+\fBrpmrebuild \-\-define "_rpmfilename %%{NAME}.rpm" bash\fP
.LP
Change package interactive
.LP
-\fBrpm \-\-rpmrebuild \-\-package \-\-change\-files "/bin/bash" /some/place/bash.rpm\fP
+\fBrpmrebuild \-\-package \-\-change\-files "/bin/bash" /some/place/bash.rpm\fP
.LP
Change package non\-interactive
.LP
-\fBrpm \-\-rpmrebuild \-\-package \-\-change\-files "a.sh && b.sh" /some/place/bash.rpm\fP
+\fBrpmrebuild \-\-package \-\-change\-files "a.sh && b.sh" /some/place/bash.rpm\fP
.LP
if you have problem with rpm building, and if you know specfile syntax, you can also edit it:
.LP
-\fBrpm \-\-rpmrebuild \-\-edit\-whole package\fP
+\fBrpmrebuild \-\-edit\-whole package\fP
.LP
batch change of version tag
-.LP
-\fBrpm \-\-rpmrebuild \-\-change\-spec\-preamble='sed \-e "s/^Version:.*/Version: YourVersion/"' YourPackage\fP
+.LP
+\fBrpmrebuild \-\-change\-spec\-preamble='sed \-e "s/^Version:.*/Version: YourVersion/"' YourPackage\fP
.SH "AUTHORS"
.LP
Eric Gerbier
@@ -303,7 +300,7 @@
.br
It is provided "as is", without any express or implied
warranties.
-.br
+.br
See the file COPYING for details.
.SH "SEE ALSO"
.LP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/man/en/rpmrebuild_plugins.1.in new/man/en/rpmrebuild_plugins.1.in
--- old/man/en/rpmrebuild_plugins.1.in 2008-04-03 08:21:13.000000000 +0200
+++ new/man/en/rpmrebuild_plugins.1.in 2008-12-11 17:25:20.000000000 +0100
@@ -3,10 +3,6 @@
rpmrebuild_plugins \- is an engine to expand \fBrpmrebuild\fP functionality.
.SH "SYNOPSIS"
rpmrebuild [\fInon\-plugins\-option\fP] [\fIplugins\-option\fP] <\fIpackagename\fP>
-.br
-or
-.br
-rpm \-\-rpmrebuild [\fInon\-plugins\-option\fP] [\fIplugins\-option\fP] <\fIpackagename\fP>
.SH "DESCRIPTION"
\fBrpmrebuild\fP itself try to do it's best to reconstruct rpm package as close to original as possible.
.LP
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 2007-11-08 19:24:34.000000000 +0100
+++ new/man/fr_FR/rpmrebuild.1.in 2009-01-09 11:30:29.000000000 +0100
@@ -3,10 +3,6 @@
rpmrebuild \- un outil pour construire un package rpm � partir d'un package install�
.SH "SYNOPSIS"
rpmrebuild [\fIoption\fP] <\fInom_de_package\fP>
-.br
-ou
-.br
-rpm \-\-rpmrebuild [\fIoption\fP] <\fInom_de_package\fP>
.SH "DESCRIPTION"
rpmrebuild est un outil pour construire facilement un package rpm.
Il peut �tre utilis� pour fabriquer un fichier rpm � partir d'un package install� ou pour modifier un package : modifiez les fichiers install�s et lancez rpmrebuild.
@@ -221,9 +217,6 @@
\fB~/.rpmmacros\fP
ce fichier est utilis� par rpm lors de la construction de packages (macros)
.TP
-\fB/etc/popt\fP
-contient des alias rpm utilis�s par rpmrebuild
-.TP
\fB$RPMREBUILD_TMPDIR/work\fP
r�pertoire des fichiers temporaires.
.SH "ENVIRONMENT"
@@ -241,39 +234,44 @@
.LP
Construire un package rpm aussi proche que possible de l'original :
.LP
-\fBrpm \-\-rpmrebuild \-\-batch package\fP
+\fBrpmrebuild \-\-batch package\fP
.LP
Construire un package modifi� :
.LP
-\fBrpm \-\-rpmrebuild \-\-keep\-perm package\fP
+\fBrpmrebuild \-\-keep\-perm package\fP
.LP
Construire un rpm � partir d'un fichier rpm en y appliquant un filtre :
.LP
-\fBrpm \-\-rpmrebuild \-\-package \-\-filter filter /some/place/package.rpm\fP
+\fBrpmrebuild \-\-package \-\-filter filter /some/place/package.rpm\fP
+.LP
+Passer des options pour rpm:
+recontruire et signer le package bash
.LP
-Passez des options pour rpm:
+\fBrpmrebuild \-\-additional "\-\-sign" bash\fP
.LP
-\fBrpm \-\-rpmrebuild \-\-additional "\-\-nodirtokens" package\fP
+reconstruire un package compatible avec rpm version 3 (legacy)
+.LP
+\fBrpmrebuild \-\-additional "\-\-nodirtokens" package\fP
.LP
Donner un nom pour le fichier rpm g�n�r�:
.LP
-\fBrpm \-\-rpmrebuild \-\-define "_rpmfilename %%{NAME}.rpm" bash\fP
+\fBrpmrebuild \-\-define "_rpmfilename %%{NAME}.rpm" bash\fP
.LP
Modification interactive du package:
.LP
-\fBrpm \-\-rpmrebuild \-\-package \-\-change\-files="/bin/bash" /some/place/package.rpm\fP
+\fBrpmrebuild \-\-package \-\-change\-files="/bin/bash" /some/place/package.rpm\fP
.LP
Modification batch du package :
.LP
-\fBrpm \-\-rpmrebuild \-\-package \-\-change\-files "a.sh && b.sh" /some/place/package.rpm\fP
+\fBrpmrebuild \-\-package \-\-change\-files "a.sh && b.sh" /some/place/package.rpm\fP
.LP
Si vous connaissez la syntaxe des fichier specfile, vous pouvez les �diter "au vol" :
.LP
-\fBrpm \-\-rpmrebuild \-\-edit\-whole package\fP
-.LP
+\fBrpmrebuild \-\-edit\-whole package\fP
+.LP
changement en mode batch de la version
-.LP
-\fBrpm \-\-rpmrebuild \-\-change\-spec\-preamble='sed \-e "s/^Version:.*/Version: VotreVersion/"' Package\fP
+.LP
+\fBrpmrebuild \-\-change\-spec\-preamble='sed \-e "s/^Version:.*/Version: VotreVersion/"' Package\fP
.SH "AUTHORS"
.LP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/man/fr_FR/rpmrebuild_plugins.1.in new/man/fr_FR/rpmrebuild_plugins.1.in
--- old/man/fr_FR/rpmrebuild_plugins.1.in 2008-04-03 08:21:13.000000000 +0200
+++ new/man/fr_FR/rpmrebuild_plugins.1.in 2008-12-11 17:25:20.000000000 +0100
@@ -3,10 +3,6 @@
rpmrebuild_plugins \- syst�me de greffons (plugins) pour �tendre les fonctions de \fBrpmrebuild\fP.
.SH "SYNOPSIS"
rpmrebuild [\fInon\-plugins\-option\fP] [\fIplugins\-option\fP] <\fIpackagename\fP>
-.br
-ou
-.br
-rpm \-\-rpmrebuild [\fInon\-plugins\-option\fP] [\fIplugins\-option\fP] <\fIpackagename\fP>
.SH "DESCRIPTION"
\fBrpmrebuild\fP essaie de reconstruire le package rpm le plus proche de l'original possible.
.LP
@@ -144,7 +140,7 @@
stdout.
.SH "EXEMPLES DE PLUGINS"
Plusieurs plugins sont fournis � titre d'exemples :
-.TP
+.TP
demofiles.plug (change\-files) : un plugin de "d�mo" pour montrer ce que l'on peut faire sur les fichiers
.TP
demo.plug (change\-spec\-*) : un plugin de "d�mo", pour montrer ce que l'on peut faire sur le fichier spec
@@ -171,5 +167,5 @@
See URL:http://rpmrebuild.sourceforge.net/.
.SH "SEE ALSO"
.LP
-rpm(8), rpmbuild(8), rpmrebuild(1), demofiles.plug(1), demo.plug(1), nodoc.plug(1), uniq.plug(1), file2pacDep.plug(1), set_tag.plug(1), 'man -k rrp' pour la doc sur les plugins fournis.
+rpm(8), rpmbuild(8), rpmrebuild(1), demofiles.plug(1), demo.plug(1), nodoc.plug(1), uniq.plug(1), file2pacDep.plug(1), set_tag.plug(1), 'man \-k rrp' pour la doc sur les plugins fournis.
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 2007-11-08 18:48:27.000000000 +0100
+++ new/man/fr_FR.UTF-8/rpmrebuild.1.in 2009-01-09 11:31:14.000000000 +0100
@@ -3,10 +3,6 @@
rpmrebuild \- un outil pour construire un package rpm à partir d'un package installé
.SH "SYNOPSIS"
rpmrebuild [\fIoption\fP] <\fInom_de_package\fP>
-.br
-ou
-.br
-rpm \-\-rpmrebuild [\fIoption\fP] <\fInom_de_package\fP>
.SH "DESCRIPTION"
rpmrebuild est un outil pour construire facilement un package rpm.
Il peut être utilisé pour fabriquer un fichier rpm à partir d'un package installé ou pour modifier un package : modifiez les fichiers installés et lancez rpmrebuild.
@@ -221,9 +217,6 @@
\fB~/.rpmmacros\fP
ce fichier est utilisé par rpm lors de la construction de packages (macros)
.TP
-\fB/etc/popt\fP
-contient des alias rpm utilisés par rpmrebuild
-.TP
\fB$RPMREBUILD_TMPDIR/work\fP
répertoire des fichiers temporaires.
.SH "ENVIRONMENT"
@@ -241,39 +234,44 @@
.LP
Construire un package rpm aussi proche que possible de l'original :
.LP
-\fBrpm \-\-rpmrebuild \-\-batch package\fP
+\fBrpmrebuild \-\-batch package\fP
.LP
Construire un package modifié :
.LP
-\fBrpm \-\-rpmrebuild \-\-keep\-perm package\fP
+\fBrpmrebuild \-\-keep\-perm package\fP
.LP
Construire un rpm à partir d'un fichier rpm en y appliquant un filtre :
.LP
-\fBrpm \-\-rpmrebuild \-\-package \-\-filter filter /some/place/package.rpm\fP
+\fBrpmrebuild \-\-package \-\-filter filter /some/place/package.rpm\fP
.LP
-Passez des options pour rpm:
+Passer des options pour rpm:
+recontruire et signer le package bash
+.LP
+\fBrpmrebuild \-\-additional "\-\-sign" bash\fP
.LP
-\fBrpm \-\-rpmrebuild \-\-additional "\-\-nodirtokens" package\fP
+reconstruire un package compatible avec rpm version 3 (legacy)
+.LP
+\fBrpmrebuild \-\-additional "\-\-nodirtokens" package\fP
.LP
Donner un nom pour le fichier rpm généré:
.LP
-\fBrpm \-\-rpmrebuild \-\-define "_rpmfilename %%{NAME}.rpm" bash\fP
+\fBrpmrebuild \-\-define "_rpmfilename %%{NAME}.rpm" bash\fP
.LP
Modification interactive du package:
.LP
-\fBrpm \-\-rpmrebuild \-\-package \-\-change\-files="/bin/bash" /some/place/package.rpm\fP
+\fBrpmrebuild \-\-package \-\-change\-files="/bin/bash" /some/place/package.rpm\fP
.LP
Modification batch du package :
.LP
-\fBrpm \-\-rpmrebuild \-\-package \-\-change\-files "a.sh && b.sh" /some/place/package.rpm\fP
+\fBrpmrebuild \-\-package \-\-change\-files "a.sh && b.sh" /some/place/package.rpm\fP
.LP
Si vous connaissez la syntaxe des fichier specfile, vous pouvez les éditer "au vol" :
.LP
-\fBrpm \-\-rpmrebuild \-\-edit\-whole package\fP
-.LP
+\fBrpmrebuild \-\-edit\-whole package\fP
+.LP
changement en mode batch de la version
-.LP
-\fBrpm \-\-rpmrebuild \-\-change\-spec\-preamble='sed \-e "s/^Version:.*/Version: VotreVersion/"' Package\fP
+.LP
+\fBrpmrebuild \-\-change\-spec\-preamble='sed \-e "s/^Version:.*/Version: VotreVersion/"' Package\fP
.SH "AUTHORS"
.LP
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 2008-04-03 08:21:13.000000000 +0200
+++ new/man/fr_FR.UTF-8/rpmrebuild_plugins.1.in 2008-12-11 17:25:20.000000000 +0100
@@ -3,10 +3,6 @@
rpmrebuild_plugins \- système de greffons (plugins) pour étendre les fonctions de \fBrpmrebuild\fP.
.SH "SYNOPSIS"
rpmrebuild [\fInon\-plugins\-option\fP] [\fIplugins\-option\fP] <\fIpackagename\fP>
-.br
-ou
-.br
-rpm \-\-rpmrebuild [\fInon\-plugins\-option\fP] [\fIplugins\-option\fP] <\fIpackagename\fP>
.SH "DESCRIPTION"
\fBrpmrebuild\fP essaie de reconstruire le package rpm le plus proche de l'original possible.
.LP
@@ -144,7 +140,7 @@
stdout.
.SH "EXEMPLES DE PLUGINS"
Plusieurs plugins sont fournis à titre d'exemples :
-.TP
+.TP
demofiles.plug (change\-files) : un plugin de "démo" pour montrer ce que l'on peut faire sur les fichiers
.TP
demo.plug (change\-spec\-*) : un plugin de "démo", pour montrer ce que l'on peut faire sur le fichier spec
@@ -171,5 +167,5 @@
See URL:http://rpmrebuild.sourceforge.net/.
.SH "SEE ALSO"
.LP
-rpm(8), rpmbuild(8), rpmrebuild(1), demofiles.plug(1), demo.plug(1), nodoc.plug(1), uniq.plug(1), file2pacDep.plug(1), set_tag.plug(1), 'man -k rrp' pour la doc sur les plugins fournis.
+rpm(8), rpmbuild(8), rpmrebuild(1), demofiles.plug(1), demo.plug(1), nodoc.plug(1), uniq.plug(1), file2pacDep.plug(1), set_tag.plug(1), 'man \-k rrp' pour la doc sur les plugins fournis.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/popt-with-POPTdesc new/popt-with-POPTdesc
--- old/popt-with-POPTdesc 2007-10-08 12:49:36.000000000 +0200
+++ new/popt-with-POPTdesc 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-### RPMREBUILD START. Don't change this string. rpmrebuild use it.###
-########################################################
-
-rpm alias --rpmrebuild --rpmrebuild-int --\
- --POPTdesc=$"recreate rpm package. 'rpm --rpmrebuild -h' for more info."
-
-rpm exec --rpmrebuild-int /usr/lib/rpmrebuild/run.sh
-
-###################################################################
-### RPMREBUILD END. Don't change this string. rpmrebuild use it.###
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/popt-without-POPTdesc new/popt-without-POPTdesc
--- old/popt-without-POPTdesc 2007-10-08 12:49:36.000000000 +0200
+++ new/popt-without-POPTdesc 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-### RPMREBUILD START. Don't change this string. rpmrebuild use it.###
-#####################################################################
-# rpm-3.0.4 and their popt age buggy
-# (or at least I can't understand their logic)
-# So I can't add some flag after '--' and look for this flag in the run.sh
-
-rpm alias --rpmrebuild --rpmrebuild-int --
-rpm exec --rpmrebuild-int /usr/lib/rpmrebuild/run.sh
-
-########################################################################
-### RPMREBUILD END. Don't change this string. rpmrebuild use it. End ###
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/processing_func.src new/processing_func.src
--- old/processing_func.src 2007-10-08 12:49:36.000000000 +0200
+++ new/processing_func.src 2008-12-11 17:27:43.000000000 +0100
@@ -2,6 +2,7 @@
###############################################################################
# Copyright (C) 2004 by Valery Reznic
# This file is a part of the rpmrebuild project
+# $Id: processing_func.src 597 2008-12-08 15:09:05Z 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/remove_from_popt.make.include new/remove_from_popt.make.include
--- old/remove_from_popt.make.include 2007-11-08 18:48:28.000000000 +0100
+++ new/remove_from_popt.make.include 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-########################################
-# This code should remove all lines from
-# the line contains 'RPMREBUILD START'
-# till (include) line 'RPMREBUILD END'
-# in the file /etc/popt
-########################################
-
-POPT=/etc/popt
-
-if [ -f $POPT ]; then
- sed -i -e '/RPMREBUILD START/,/RPMREBUILD END/d' $POPT
-fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.files new/rpmrebuild.files
--- old/rpmrebuild.files 2008-04-03 08:21:13.000000000 +0200
+++ new/rpmrebuild.files 2008-12-11 17:25:21.000000000 +0100
@@ -1,19 +1,16 @@
%defattr(-,root,root)
/usr/bin/rpmrebuild
%dir /usr/lib/rpmrebuild
- /usr/lib/rpmrebuild/.popt
/usr/lib/rpmrebuild/VERSION
- /usr/lib/rpmrebuild/rpmrebuild_popt
- /usr/lib/rpmrebuild/rpmrebuild.sh
/usr/lib/rpmrebuild/processing_func.src
+ /usr/lib/rpmrebuild/rpmrebuild.sh
+ /usr/lib/rpmrebuild/rpmrebuild.usedtags
/usr/lib/rpmrebuild/rpmrebuild_parser.src
+ /usr/lib/rpmrebuild/rpmrebuild_rpmqf.src
/usr/lib/rpmrebuild/rpmrebuild_files.sh
/usr/lib/rpmrebuild/rpmrebuild_buildroot.sh
/usr/lib/rpmrebuild/rpmrebuild_ghost.sh
- /usr/lib/rpmrebuild/run.sh
/usr/lib/rpmrebuild/spec_func.src
- /usr/lib/rpmrebuild/popt-without-POPTdesc
- /usr/lib/rpmrebuild/popt-with-POPTdesc
%dir /usr/lib/rpmrebuild/locale
%dir /usr/lib/rpmrebuild/locale/fr_FR
/usr/lib/rpmrebuild/locale/fr_FR/rpmrebuild.lang
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.lsm new/rpmrebuild.lsm
--- old/rpmrebuild.lsm 2008-05-02 10:23:02.000000000 +0200
+++ new/rpmrebuild.lsm 2008-08-08 16:26:58.000000000 +0200
@@ -1,7 +1,7 @@
Begin4
Title: rpmrebuild
-Version: 2.2.2-1
-Entered-date: 2008-04-28
+Version: 2.2.3-1
+Entered-date: 2008-08-07
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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.sh new/rpmrebuild.sh
--- old/rpmrebuild.sh 2008-03-28 09:20:45.000000000 +0100
+++ new/rpmrebuild.sh 2008-12-19 09:05:02.000000000 +0100
@@ -4,7 +4,7 @@
#
# Copyright (C) 2002 by Eric Gerbier
# Bug reports to: gerbier@users.sourceforge.net
-# $Id: rpmrebuild.sh 538 2007-11-08 18:44:16Z gerbier $
+# $Id: rpmrebuild.sh 613 2008-12-16 15:06:16Z 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
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
#
###############################################################################
-VERSION="$Id: rpmrebuild.sh 538 2007-11-08 18:44:16Z gerbier $"
+VERSION="$Id: rpmrebuild.sh 613 2008-12-16 15:06:16Z valery_reznic $"
# debug
#set -x
@@ -107,7 +107,7 @@
[ "X$spec_only" = "Xyes" ] && return 0 ## spec only mode, no questions
AskYesNo "$WantContinue" || return
- RELEASE_ORIG="$(spec_query_qf '%{RELEASE}')"
+ RELEASE_ORIG="$(spec_query qf_spec_release )"
[ -z "$RELEASE_NEW" ] && \
AskYesNo "$WantChangeRelease" && {
echo -n "$EnterRelease $RELEASE_ORIG): "
@@ -184,9 +184,19 @@
# reconstruction fichier rpm : le src.rpm est inutile
# build rpm file, the src.rpm is not usefull to do
# for rpm 4.1 : use rpmbuild
- local BUILDCMD=rpm
- [ -x /usr/bin/rpmbuild ] && BUILDCMD=rpmbuild
- eval $BUILDCMD $rpm_defines -bb $rpm_verbose $additional ${FIC_SPEC} || {
+ local BUILDCMD=rpmbuild
+
+ # rpm 4.6 ignore BuildRoot in the spec file,
+ # so I have to provide define on the command line
+ # Worse, it disallow buildroot "/", so I have to trick it.
+ if [ "x$BUILDROOT" = "x/" ]; then
+ BUILDROOT="$RPMREBUILD_TMPDIR/my_root"
+ # Just in case previous link is here
+ rm -f $BUILDROOT || return
+ # Trick rpm (I hope :)
+ ln -s / $BUILDROOT || return
+ fi
+ eval $BUILDCMD --define "'buildroot $BUILDROOT'" $rpm_defines -bb $rpm_verbose $additional ${FIC_SPEC} || {
Error "package '${PAQUET}' $BuildFailed"
return 1
}
@@ -284,12 +294,8 @@
# get rpm tags
rpm_tags=$( rpm --querytags )
- # get tags used in rpmrebuild
- # rpmrebuild_popt should follow a strict syntaxe
- # "%|" begin a test line
- # tr command remove all not alpha characters
- # the "dummy" query should be filtered too
- rpmrebuild_tags=$( grep "^%|" $MY_LIB_DIR/rpmrebuild_popt | tr -cs '[:alpha:]' '[\n*]' | grep -v dummy )
+ # rem : rpmrebuild.usedtags is builf by extract_tags.pl during package build (cf Makefile)
+ rpmrebuild_tags=$( cat $MY_LIB_DIR/rpmrebuild.usedtags )
# check for all rpmrebuild tags
errors=0
@@ -351,6 +357,7 @@
source $MY_LIB_DIR/rpmrebuild_parser.src || return
source $MY_LIB_DIR/spec_func.src || return
source $MY_LIB_DIR/processing_func.src || return
+ source $MY_LIB_DIR/rpmrebuild_rpmqf.src || return
# check language
case "$LANG" in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.spc new/rpmrebuild.spc
--- old/rpmrebuild.spc 2007-10-17 21:18:29.000000000 +0200
+++ new/rpmrebuild.spc 2008-12-16 18:07:13.000000000 +0100
@@ -1,4 +1,3 @@
-%{expand:%%define rpmold %(if [ -n "$RPMOLD" ]; then echo 1; else echo 0; fi)}
# Initial spec file created by autospec ver. 0.6 with rpm 2.5 compatibility
Summary: A tool to build rpm file from rpm database
Summary(fr): Un outil pour construire un package depuis une base rpm
@@ -20,13 +19,8 @@
Requires: sed
# sort
Requires: textutils
-%if %rpmold
-Requires: rpm < 4.0
-Release: %{release}rpm3
-%else
Requires: rpm >= 4.0, /usr/bin/rpmbuild
-Release: %{release}rpm4
-%endif
+Release: %{release}
%description
rpmrebuild allow to build an rpm file from an installed rpm, or from
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.spec new/rpmrebuild.spec
--- old/rpmrebuild.spec 2008-08-07 08:20:10.000000000 +0200
+++ new/rpmrebuild.spec 2009-01-09 11:42:07.000000000 +0100
@@ -1,6 +1,5 @@
-Version: 2.2.3
+Version: 2.3
%define release 1
-%{expand:%%define rpmold %(if [ -n "$RPMOLD" ]; then echo 1; else echo 0; fi)}
# Initial spec file created by autospec ver. 0.6 with rpm 2.5 compatibility
Summary: A tool to build rpm file from rpm database
Summary(fr): Un outil pour construire un package depuis une base rpm
@@ -22,13 +21,8 @@
Requires: sed
# sort
Requires: textutils
-%if %rpmold
-Requires: rpm < 4.0
-Release: %{release}rpm3
-%else
Requires: rpm >= 4.0, /usr/bin/rpmbuild
-Release: %{release}rpm4
-%endif
+Release: %{release}
%description
rpmrebuild allow to build an rpm file from an installed rpm, or from
@@ -60,58 +54,19 @@
%files -f rpmrebuild.files
-%postun
-#echo "%postun $1"
+%changelog
+* Wed Jan 09 2009 2.3
+- release version 2.3
-[ $1 -ne 0 ] && exit 0 || :
-########################################
-# This code should remove all lines from
-# the line contains 'RPMREBUILD START'
-# till (include) line 'RPMREBUILD END'
-# in the file /etc/popt
-########################################
-
-POPT=/etc/popt
-
-if [ -f $POPT ]; then
- sed -i -e '/RPMREBUILD START/,/RPMREBUILD END/d' $POPT
-fi
-
-%triggerin -- rpm < 4.0.3
-#echo "%triggerin -- rpm < 4.0.3 ('$1' '$2')"
-
-########################################
-# This code should remove all lines from
-# the line contains 'RPMREBUILD START'
-# till (include) line 'RPMREBUILD END'
-# in the file /etc/popt
-########################################
-
-POPT=/etc/popt
-
-if [ -f $POPT ]; then
- sed -i -e '/RPMREBUILD START/,/RPMREBUILD END/d' $POPT
-fi
-cat /usr/lib/rpmrebuild/popt-without-POPTdesc >> /etc/popt || exit
-
-%triggerin -- rpm >= 4.0.3
-#echo "%triggerin -- rpm >= 4.0.3 ('$1' '$2')"
-
-########################################
-# This code should remove all lines from
-# the line contains 'RPMREBUILD START'
-# till (include) line 'RPMREBUILD END'
-# in the file /etc/popt
-########################################
-
-POPT=/etc/popt
-
-if [ -f $POPT ]; then
- sed -i -e '/RPMREBUILD START/,/RPMREBUILD END/d' $POPT
-fi
-cat /usr/lib/rpmrebuild/popt-with-POPTdesc >> /etc/popt || exit
+* Tue Dec 16 2008
+- fix a problem: installation test failed when repackaged rpm file (with -p)
+
+* Tue Dec 16 2008
+- fix for rpm 4.6 (fedora 10), that ignore BuildRoot in the spec file flag
+
+* Wed Dec 05 2008
+- do not use popt any more
-%changelog
* Wed Aug 06 2008 2.2.3-1
- fix a problem with new rpm security on mandriva (defaultbuildroot)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_parser.src new/rpmrebuild_parser.src
--- old/rpmrebuild_parser.src 2008-05-15 19:53:58.000000000 +0200
+++ new/rpmrebuild_parser.src 2008-12-19 09:05:02.000000000 +0100
@@ -3,7 +3,7 @@
#
# Copyright (C) 2002 by Eric Gerbier
# Bug reports to: gerbier@users.sourceforge.net
-# $Id: rpmrebuild_parser.src 573 2008-04-16 12:44:26Z gerbier $
+# $Id: rpmrebuild_parser.src 610 2008-12-16 13:34:38Z 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
@@ -1060,8 +1060,7 @@
tst_rpm=$( file $PAQUET )
case "x$tst_rpm" in
x*RPM\ *)
- #ok
- return
+ : #ok
;;
*)
Error "$NotAnRpm '$PAQUET'"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_popt new/rpmrebuild_popt
--- old/rpmrebuild_popt 2007-10-08 12:49:36.000000000 +0200
+++ new/rpmrebuild_popt 1970-01-01 01:00:00.000000000 +0100
@@ -1,205 +0,0 @@
-# rpm query has a strange bug:
-# when format is enough long/complicate/whatsoever/
-# first constant string is disappears.
-# i.e, string '#dummy' will not be printed.
-# Without this format (with '#dummy' string)
-# '#BUILDHOST: ' is disappears.
-# If one day this bug will be fixed, it'll be just harmless
-# comment '#dummy' in the specfile
-# CHANGE:
-# in the at least rpm-4.3.1 and 4.3.2 it doesn't help:
-# i have to add TWO strings with 'dummy'.
-# No idea is it due to rpm change or because Eric add more tags.
-#
-# be careful : this file should follow a strict format,
-# because rpm tags used here will be check against available rpm tags
-# 1) rpm alias definition, ex : rpm alias --spec_preamble --qf
-# 2) query, ex : %|SUMMARY?{\
-# 3) output, ex : [Summary: %{SUMMARY}\n]\
-
-rpm alias --spec_preamble --qf '\
-%|BUILDHOST?{#dummy}|\
-%|BUILDHOST?{#dummy}|\
-\
-%|BUILDHOST?{\
-[#BUILDHOST: %{BUILDHOST}\n]\
-}|\
-%|BUILDTIME?{\
-[#BUILDTIME: %{BUILDTIME:date}\n]\
-}|\
-%|SOURCERPM?{\
-[#SOURCERPM: %{SOURCERPM}\n]\
-}|\
-%|PATCH?{\
-[#PATCH: %{PATCH}\n]\
-}|\
-%|RPMVERSION?{\
-[#RPMVERSION: %{RPMVERSION}\n]\
-}|\
-%|COOKIE?{\
-[#COOKIE: %{COOKIE}\n]\
-}|\
-%|INSTALLTIME?{\
-[#INSTALLTIME: %{INSTALLTIME:date}\n]\
-}|\
-%|INSTPREFIXES?{\
-[#INSTPREFIXES: %{INSTPREFIXES}\n]\
-}|\
-%|OS?{\
-[#OS: %{OS}\n]\
-}|\
-%|SIZE?{\
-[#SIZE: %{SIZE}\n]\
-}|\
-%|ARCHIVESIZE?{\
-[#ARCHIVESIZE: %{ARCHIVESIZE}\n]\
-}|\
-%|ARCH?{\
-[#ARCH: %{ARCH}\n]\
-}|\
-%|ARCH?{\
-[BuildArch: %{ARCH}\n]\
-}|\
-%|NAME?{\
-[Name: %{NAME}\n]\
-}|\
-%|VERSION?{\
-[Version: %{VERSION}\n]\
-}|\
-%|RELEASE?{\
-[Release: %{RELEASE}\n]\
-}|\
-%|LICENSE?{\
-[License: %{LICENSE}\n]\
-}|\
-%|GROUP?{\
-[Group: %{GROUP}\n]\
-}|\
-%|SUMMARY?{\
-[Summary: %{SUMMARY}\n]\
-}|\
-%|DISTRIBUTION?{\
-[Distribution: %{DISTRIBUTION}\n]\
-}|\
-%|URL?{\
-[URL: %{URL}\n]\
-}|\
-%|VENDOR?{\
-[Vendor: %{VENDOR}\n]\
-}|\
-%|PACKAGER?{\
-[Packager: %{PACKAGER}\n]\
-}|\
-%|EPOCH?{\
-[Epoch: %{EPOCH}\n]\
-}|\
-%|EXCLUDEARCH?{\
-[ExcludeArch: %{EXCLUDEARCH}\n]\
-}|\
-%|EXCLUSIVEARCH?{\
-[ExclusiveArch: %{EXCLUSIVEARCH}\n]\
-}|\
-%|EXCLUDEOS?{\
-[ExcludeOs: %{EXCLUDEOS}\n]\
-}|\
-%|EXCLUSIVEOS?{\
-[ExclusiveOs: %{EXCLUSIVEOS}\n]\
-}|\
-%|PREFIXES?{\
-[Prefix: %{PREFIXES}\n]\
-}|\
-'
-
-rpm alias --spec_conflicts --qf \
-'\
-%|CONFLICTNAME?{\
-[Conflicts: %{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]\
-}|\
-'
-
-rpm alias --spec_obsoletes --qf \
-'\
-%|OBSOLETES?{\
-[Obsoletes: %{OBSOLETES}\n]\
-}|\
-'
-
-rpm alias --spec_provides --qf \
-'\
-%|PROVIDES?{\
-[Provides: %{PROVIDES} %{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}\n]\
-}|\
-'
-
-rpm alias --spec_requires --qf \
-"\
-%|REQUIRENAME?{\
-[Requires: %{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]\
-}|\
-"
-
-rpm alias --spec_description --qf \
-'\
-[%{DESCRIPTION}\n]\
-'
-
-rpm alias --spec_files --qf \
-'\
-[\
-%.1{FILEMODES:perms}\n\
-%{FILEFLAGS:fflags}\n\
-%6.6{FILEMODES:octal}\n\
-%{FILEUSERNAME}\n\
-%{FILEGROUPNAME}\n\
-%{FILEVERIFYFLAGS:octal}\n\
-%{FILELANGS}\n\
-%{FILENAMES}\n\
-]\
-'
-
-rpm alias --spec_triggers --qf \
-'\
-[%%trigger%{TRIGGERTYPE} -p %{TRIGGERSCRIPTPROG} -- %{TRIGGERCONDS}\n%|TRIGGERSCRIPTS?{%{TRIGGERSCRIPTS}\n}|]\
-\
-'
-
-rpm alias --spec_pre --qf \
-'\
-%|PREINPROG\
-?{%%pre -p %{PREINPROG}\n%|PREIN?{[%{PREIN}\n]}|}\
-:{%|PREIN?{\n%%pre\n[%{PREIN}\n]}|}|\
-'
-rpm alias --spec_post --qf \
-'\
-%|POSTINPROG\
-?{%%post -p %{POSTINPROG}\n%|POSTIN?{[%{POSTIN}\n]}|}\
-:{%|POSTIN?{\n%%post\n[%{POSTIN}\n]}|}|\
-'
-
-rpm alias --spec_preun --qf \
-'\
-%|PREUNPROG\
-?{%%preun -p %{PREUNPROG}\n%|PREUN?{[%{PREUN}\n]}|}\
-:{%|PREUN?{\n%%preun\n[%{PREUN}\n]}|}|\
-'
-
-rpm alias --spec_postun --qf \
-'\
-%|POSTUNPROG\
-?{%%postun -p %{POSTUNPROG}\n%|POSTUN?{[%{POSTUN}\n]}|}\
-:{%|POSTUN?{\n%%postun\n[%{POSTUN}\n]}|}|\
-'
-
-rpm alias --spec_verifyscript --qf \
-'\
-%|VERIFYSCRIPTPROG\
-?{%%verifyscript -p %{VERIFYSCRIPTPROG}\n%|VERIFYSCRIPT?{[%{VERIFYSCRIPT}\n]}|}\
-:{%|VERIFYSCRIPT?{\n%%verifyscript\n[%{VERIFYSCRIPT}\n]}|}|\
-'
-
-rpm alias --spec_changelog --qf \
-'\
-%|CHANGELOGTIME\
-?{[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n\n%{CHANGELOGTEXT}\n\n]}|\
-'
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_rpmqf.src new/rpmrebuild_rpmqf.src
--- old/rpmrebuild_rpmqf.src 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmrebuild_rpmqf.src 2008-12-11 17:30:54.000000000 +0100
@@ -0,0 +1,129 @@
+#!/bin/bash
+###############################################################################
+# Copyright (C) 2002 by Eric Gerbier
+# Bug reports to: gerbier@users.sourceforge.net
+# $Id: rpmrebuild_rpmqf.src 596 2008-12-08 15:06:04Z 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
+# 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.
+#
+###############################################################################
+# this file contains rpm query definitions
+###############################################################################
+# rpm query has a strange bug:
+# when format is enough long/complicate/whatsoever/
+# first constant string is disappears.
+# i.e, string '#dummy' will not be printed.
+# Without this format (with '#dummy' string)
+# '#BUILDHOST: ' is disappears.
+# If one day this bug will be fixed, it'll be just harmless
+# comment '#dummy' in the specfile
+# CHANGE:
+# in the at least rpm-4.3.1 and 4.3.2 it doesn't help:
+# i have to add TWO strings with 'dummy'.
+# No idea is it due to rpm change or because Eric add more tags.
+
+function qf_spec_preamble {
+echo '%|BUILDHOST?{#dummy}|\
+%|BUILDHOST?{#dummy}|\
+%|BUILDHOST?{[#BUILDHOST: %{BUILDHOST}]}|\
+%|BUILDTIME?{[#BUILDTIME: %{BUILDTIME:date}]}|\
+%|SOURCERPM?{[#SOURCERPM: %{SOURCERPM}]}|\
+%|PATCH?{[#PATCH: %{PATCH}]}|\
+%|RPMVERSION?{[#RPMVERSION: %{RPMVERSION}]}|\
+%|COOKIE?{[#COOKIE: %{COOKIE}]}|\
+%|INSTALLTIME?{[#INSTALLTIME: %{INSTALLTIME:date}]}|\
+%|INSTPREFIXES?{[#INSTPREFIXES: %{INSTPREFIXES}]}|\
+%|OS?{[#OS: %{OS}]}|\
+%|SIZE?{[#SIZE: %{SIZE}]}|\
+%|ARCHIVESIZE?{[#ARCHIVESIZE: %{ARCHIVESIZE}]}|\
+%|ARCH?{[#ARCH: %{ARCH}]}|\
+%|ARCH?{[BuildArch: %{ARCH}]}|\
+%|NAME?{[Name: %{NAME}]}|\
+%|VERSION?{[Version: %{VERSION}]}|\
+%|RELEASE?{[Release: %{RELEASE}]}|\
+%|LICENSE?{[License: %{LICENSE}] }|\
+%|GROUP?{[Group: %{GROUP}]}|\
+%|SUMMARY?{[Summary: %{SUMMARY}]}|\
+%|DISTRIBUTION?{[Distribution: %{DISTRIBUTION}]}|\
+%|URL?{[URL: %{URL}]}|\
+%|VENDOR?{[Vendor: %{VENDOR}]}|\
+%|PACKAGER?{[Packager: %{PACKAGER}]}|\
+%|EPOCH?{[Epoch: %{EPOCH}]}|\
+%|EXCLUDEARCH?{[ExcludeArch: %{EXCLUDEARCH}]}|\
+%|EXCLUSIVEARCH?{[ExclusiveArch: %{EXCLUSIVEARCH}]}|\
+%|EXCLUDEOS?{[ExcludeOs: %{EXCLUDEOS}]}|\
+%|EXCLUSIVEOS?{[ExclusiveOs: %{EXCLUSIVEOS}] }|\
+%|PREFIXES?{[Prefix: %{PREFIXES}]}|'
+}
+
+function qf_spec_conflicts {
+echo '%|CONFLICTNAME?{[Conflicts: %{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]}|'
+}
+
+function qf_spec_obsoletes {
+echo '%|OBSOLETES?{[Obsoletes: %{OBSOLETES}\n]}|'
+}
+
+function qf_spec_provides {
+echo '%|PROVIDES?{[Provides: %{PROVIDES} %{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}\n]}|'
+}
+
+function qf_spec_requires {
+echo '%|REQUIRENAME?{[Requires: %{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]}|'
+}
+
+function qf_spec_description {
+echo '%|DESCRIPTION?{[%{DESCRIPTION}\n]}|'
+}
+
+function qf_spec_files {
+echo '[%.1{FILEMODES:perms}\
+%{FILEFLAGS:fflags}\
+%6.6{FILEMODES:octal}\
+%{FILEUSERNAME}\
+%{FILEGROUPNAME}\
+%{FILEVERIFYFLAGS:octal}\
+%{FILELANGS}\
+%{FILENAMES}\
+]'
+}
+
+function qf_spec_triggers {
+echo '[%%trigger%{TRIGGERTYPE} -p %{TRIGGERSCRIPTPROG} -- %{TRIGGERCONDS}\n%|TRIGGERSCRIPTS?{%{TRIGGERSCRIPTS}\n}|]'
+}
+
+function qf_spec_pre {
+echo '%|PREINPROG?{%%pre -p %{PREINPROG}\n%|PREIN?{[%{PREIN}\n]}|}:{%|PREIN?{\n%%pre\n[%{PREIN}\n]}|}|'
+}
+
+function qf_spec_post {
+echo '%|POSTINPROG?{%%post -p %{POSTINPROG}\n%|POSTIN?{[%{POSTIN}\n]}|}:{%|POSTIN?{\n%%post\n[%{POSTIN}\n]}|}|'
+}
+
+function qf_spec_preun {
+echo '%|PREUNPROG?{%%preun -p %{PREUNPROG}\n%|PREUN?{[%{PREUN}\n]}|}:{%|PREUN?{\n%%preun\n[%{PREUN}\n]}|}|'
+}
+
+function qf_spec_postun {
+echo '%|POSTUNPROG?{%%postun -p %{POSTUNPROG}\n%|POSTUN?{[%{POSTUN}\n]}|}:{%|POSTUN?{\n%%postun\n[%{POSTUN}\n]}|}|'
+}
+
+function qf_spec_verifyscript {
+echo '%|VERIFYSCRIPTPROG?{%%verifyscript -p %{VERIFYSCRIPTPROG}\n%|VERIFYSCRIPT?{[%{VERIFYSCRIPT}\n]}|}:{%|VERIFYSCRIPT?{\n%%verifyscript\n[%{VERIFYSCRIPT}\n]}|}|'
+}
+
+function qf_spec_changelog {
+echo '%|CHANGELOGNAME?{[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]}|'
+}
+
+function qf_spec_release {
+echo '%|RELEASE?{%{RELEASE}}|'
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/run.sh new/run.sh
--- old/run.sh 2007-10-08 12:49:36.000000000 +0200
+++ new/run.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-#!/bin/sh
-# This script should be run only by the rpm via popt file"
-# In the rpm-3.0.4 first param is /rpm/bin, second - ";"
-# freshen.sh comment (in rpm-3.0.4) say that ';' may be
-# firest param too.
-# In rpm-4.0.3 (may be early ?) popt does not pass additional parameters.
-
-param_to_find=";"
-case "x$param_to_find" in
- "x$1") shift 1;;
- "x$2") shift 2;;
-esac
-exec rpmrebuild "$@"
-exit 1
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec.scripts.input new/spec.scripts.input
--- old/spec.scripts.input 2007-10-08 12:49:36.000000000 +0200
+++ new/spec.scripts.input 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-%postun
-#echo "%postun $1"
-
-[ $1 -ne 0 ] && exit 0 || :
-include remove_from_popt.make.include
-
-%triggerin -- rpm < 4.0.3
-#echo "%triggerin -- rpm < 4.0.3 ('$1' '$2')"
-
-include remove_from_popt.make.include
-cat /usr/lib/rpmrebuild/popt-without-POPTdesc >> /etc/popt || exit
-
-%triggerin -- rpm >= 4.0.3
-#echo "%triggerin -- rpm >= 4.0.3 ('$1' '$2')"
-
-include remove_from_popt.make.include
-cat /usr/lib/rpmrebuild/popt-with-POPTdesc >> /etc/popt || exit
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec.scripts.make.sh new/spec.scripts.make.sh
--- old/spec.scripts.make.sh 2007-10-08 12:49:36.000000000 +0200
+++ new/spec.scripts.make.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-#!/bin/sh
-(
- while :; do
- if ! read line; then
- [ "x$line" = "x" ] && break
- fi
- set -- $line
- case "X$1" in
- Xinclude)
- case "X$2" in
- X | X#*)
- echo "$0: line '$line'" 1>2
- echo "contains 'include' without filename." 1>&2
- exit 1
- ;;
-
- *)
- case "X$3" in
- X | X#*) # ok, found include
- cat -- "$2" || exit
- ;;
-
- *)
- echo "$0: line '$line'" 1>&2
- echo "contains 'include' with more than one filename." 1>&2
- exit 1;
- ;;
- esac
- ;;
- esac
- ;;
-
- *)
- echo "$line" || exit
- ;;
- esac
- done
-) || exit
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec_func.src new/spec_func.src
--- old/spec_func.src 2008-08-07 08:17:47.000000000 +0200
+++ new/spec_func.src 2008-12-11 17:25:56.000000000 +0100
@@ -2,6 +2,7 @@
###############################################################################
# Copyright (C) 2004 by Valery Reznic
# This file is a part of the rpmrebuild project
+# $Id: spec_func.src 598 2008-12-08 15:17:07Z 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,14 +39,9 @@
###############################################################################
function spec_query
{
- local RPM_QUERY="rpm --query --i18ndomains /dev/null $package_flag"
- HOME=$MY_LIB_DIR $RPM_QUERY $1 $PAQUET || return
- return 0
-}
-
-function spec_query_qf
-{
- spec_query "--queryformat '$1'" || return
+ rpm_qf=$( $1 )
+ local RPM_QUERY="rpm --query --i18ndomains /dev/null $package_flag --queryformat "
+ $RPM_QUERY "$rpm_qf" $PAQUET || return
return 0
}
@@ -53,7 +49,7 @@
function spec_files
{
rm -f $FILES_IN || return
- spec_query --spec_files > $FILES_IN || return
+ spec_query qf_spec_files > $FILES_IN || return
/bin/bash $MY_LIB_DIR/rpmrebuild_files.sh < $FILES_IN || return
return 0
}
@@ -66,9 +62,9 @@
}"
if [ "x$RELEASE_NEW" = "x" ]; then
- spec_query --spec_preamble || return
+ spec_query qf_spec_preamble || return
else
- spec_query --spec_preamble | sed -e "$sed_release" || return
+ spec_query qf_spec_preamble | sed -e "$sed_release" || return
fi
}
@@ -80,7 +76,7 @@
# Comment out Provides with pgp()
local sed_provides='/Provides[[:space:]]*:[[:space:]]*gpg(.*)/s/^/#/'
[ "X$autoprovide" = "Xyes" ] && sed_provides="$sed_provides$sed_comment"
- spec_query --spec_provides | sed -e "$sed_provides" || return
+ spec_query qf_spec_provides | sed -e "$sed_provides" || return
return 0
}
@@ -92,7 +88,7 @@
# Comment out Requires with rpmlib()
local sed_requires='/Requires[[:space:]]*:[[:space:]]*rpmlib(.*)/s/^/#/'
[ "X$autorequire" = "Xyes" ] && sed_requires="$sed_requires$sed_comment"
- spec_query --spec_requires | sed -e "$sed_requires" || return
+ spec_query qf_spec_requires | sed -e "$sed_requires" || return
return 0
}
@@ -103,19 +99,19 @@
local i=1
spec_preamble > $SPEC_PREAMBLE.$i || return
- spec_query --spec_conflicts > $SPEC_CONFLICTS.$i || return
- spec_query --spec_obsoletes > $SPEC_OBSOLETES.$i || return
+ spec_query qf_spec_conflicts > $SPEC_CONFLICTS.$i || return
+ spec_query qf_spec_obsoletes > $SPEC_OBSOLETES.$i || return
spec_provides > $SPEC_PROVIDES.$i || return
spec_requires > $SPEC_REQUIRES.$i || return
- spec_query --spec_description > $SPEC_DESCRIPTION.$i || return
+ spec_query qf_spec_description > $SPEC_DESCRIPTION.$i || return
spec_files > $SPEC_FILES.$i || return
- spec_query --spec_triggers > $SPEC_TRIGGERS.$i || return
- spec_query --spec_pre > $SPEC_PRE.$i || return
- spec_query --spec_post > $SPEC_POST.$i || return
- spec_query --spec_preun > $SPEC_PREUN.$i || return
- spec_query --spec_postun > $SPEC_POSTUN.$i || return
- spec_query --spec_verifyscript > $SPEC_VERIFYSCRIPT.$i || return
- spec_query --spec_changelog > $SPEC_CHANGELOG.$i || return
+ spec_query qf_spec_triggers > $SPEC_TRIGGERS.$i || return
+ spec_query qf_spec_pre > $SPEC_PRE.$i || return
+ spec_query qf_spec_post > $SPEC_POST.$i || return
+ spec_query qf_spec_preun > $SPEC_PREUN.$i || return
+ spec_query qf_spec_postun > $SPEC_POSTUN.$i || return
+ spec_query qf_spec_verifyscript > $SPEC_VERIFYSCRIPT.$i || return
+ spec_query qf_spec_changelog > $SPEC_CHANGELOG.$i || return
return 0
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org