Mailinglist Archive: opensuse-commit (1248 mails)

< Previous Next >
commit rpmrebuild for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 06 Apr 2010 22:51:05 +0200
  • Message-id: <20100406205105.30E2B202A8@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package rpmrebuild for openSUSE:Factory
checked in at Tue Apr 6 22:51:05 CEST 2010.



--------
--- rpmrebuild/rpmrebuild.changes 2009-08-05 13:09:36.000000000 +0200
+++ rpmrebuild/rpmrebuild.changes 2010-04-06 16:48:56.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Apr 6 14:48:25 UTC 2010 - hvogel@xxxxxxxxxx
+
+- Update to version 2.4
+ o add -l / --list-plugin option
+ o add -5 / --md5-compat-digest option
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
rpmrebuild-2.3.tar.bz2

New:
----
rpmrebuild-2.4.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rpmrebuild.spec ++++++
--- /var/tmp/diff_new_pack.PSvNHx/_old 2010-04-06 22:49:45.000000000 +0200
+++ /var/tmp/diff_new_pack.PSvNHx/_new 2010-04-06 22:49:45.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package rpmrebuild (Version 2.3)
+# spec file for package rpmrebuild (Version 2.4)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -19,10 +19,10 @@


Name: rpmrebuild
-License: GPL v2 or later
+License: GPLv2+
Group: System/Packages
AutoReqProv: on
-Version: 2.3
+Version: 2.4
Release: 1
Summary: A tool to build a rpm file from the rpm database
Url: http://rpmrebuild.sourceforge.net

++++++ rpmrebuild-2.3.tar.bz2 -> rpmrebuild-2.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Changelog new/Changelog
--- old/Changelog 2009-01-09 10:41:37.000000000 +0100
+++ new/Changelog 2009-12-11 09:53:36.000000000 +0100
@@ -1,3 +1,9 @@
+* Fri Dec 11 2009 <gerbier@xxxxxxxxxxxxxxxxxxxxx> 2.4
+- add -l / --list-plugin option
+
+* Tue Nov 12 2009 <valery_reznic@xxxxxxxxxxxxxxxxxxxxx>
+- add -5 / --md5-compat-digest option
+
* Wed Jan 09 2009 <gerbier@xxxxxxxxxxxxxxxxxxxxx> 2.3
- release version 2.3

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/News new/News
--- old/News 2009-01-09 10:41:21.000000000 +0100
+++ new/News 2009-12-11 09:49:32.000000000 +0100
@@ -1,4 +1,5 @@
-* 2009-01-09 : release 2.2.3-1, do not use popt any more, fix problem with rpm
4.6 (fedora10), that ignore BuildRoot
+* 2009-12-11 : release 2.4-1, --list-plugin and --md5-compat-digest options
+* 2009-01-09 : release 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 2009-01-09 10:33:05.000000000 +0100
+++ new/Version 2009-12-11 09:20:55.000000000 +0100
@@ -1 +1 @@
-2.3
+2.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/locale/en/rpmrebuild.lang
new/locale/en/rpmrebuild.lang
--- old/locale/en/rpmrebuild.lang 2007-10-09 14:18:21.000000000 +0200
+++ new/locale/en/rpmrebuild.lang 2009-11-20 09:07:47.000000000 +0100
@@ -43,8 +43,10 @@
UsageFilter='alias for --change-spec-whole'
UsageInclude='read options from the file <file>'
UsageKeepPerm='alias for --pug-from-fs'
+UsageListPlug='list installed plugins'
UsagePugFs='keep installed files permission, uid and gid'
UsagePugDb='use files permission, uid and gid from rpm db'
+UsageMd5CompatDigest='use rpm 4.4 compatible digest (md5)'
UsageModify='alias for --change-files'
UsageNoTestInstall='do not perform a test install'
UsagePackage='use package file, not installed rpm'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/locale/fr_FR/rpmrebuild.lang
new/locale/fr_FR/rpmrebuild.lang
--- old/locale/fr_FR/rpmrebuild.lang 2007-11-08 19:16:16.000000000 +0100
+++ new/locale/fr_FR/rpmrebuild.lang 2009-11-20 09:07:47.000000000 +0100
@@ -43,8 +43,10 @@
UsageFilter='�quivalent de --change-spec-whole'
UsageInclude='lit les options dans le fichier <file>'
UsageKeepPerm='�quivalent de --pug-from-fs'
+UsageListPlug='liste les plugins install�s'
UsagePugFs='conserver les permissions, uid et gid des fichiers install�s'
UsagePugDb='utiliser les permissions,uid, gid d�finis dans la base rpm'
+UsageMd5CompatDigest='use rpm 4.4 compatible digest (md5)'
UsageModify='�quivalent de --change-files'
UsageNoTestInstall="ne pas lancer le test d'installation en fin de
construction"
UsagePackage="travaille � partir du fichier rpm sp�cifi�, au lieu d'un package
install�"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/locale/fr_FR.UTF-8/rpmrebuild.lang
new/locale/fr_FR.UTF-8/rpmrebuild.lang
--- old/locale/fr_FR.UTF-8/rpmrebuild.lang 2007-11-08 19:14:12.000000000
+0100
+++ new/locale/fr_FR.UTF-8/rpmrebuild.lang 2009-11-20 09:07:47.000000000
+0100
@@ -43,8 +43,10 @@
UsageFilter='équivalent de --change-spec-whole'
UsageInclude='lit les options dans le fichier <file>'
UsageKeepPerm='équivalent de --pug-from-fs'
+UsageListPlug='liste les plugins installés'
UsagePugFs='conserver les permissions, uid et gid des fichiers installés'
UsagePugDb='utiliser les permissions,uid, gid définis dans la base rpm'
+UsageMd5CompatDigest='use rpm 4.4 compatible digest (md5)'
UsageModify='équivalent de --change-files'
UsageNoTestInstall="ne pas lancer le test d'installation en fin de
construction"
UsagePackage="travaille à partir du fichier rpm spécifié, au lieu d'un package
installé"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plugins/Makefile new/plugins/Makefile
--- old/plugins/Makefile 2008-04-03 08:29:51.000000000 +0200
+++ new/plugins/Makefile 2009-12-11 10:29:04.000000000 +0100
@@ -1,8 +1,9 @@
-# $Id: Makefile 558 2008-04-02 08:43:02Z gerbier $
+# $Id: Makefile 642 2009-12-11 09:29:03Z gerbier $
TOP_DIR := ..
include $(TOP_DIR)/Makefile.include

PLUGINS := \
+ compat_digest.plug \
demo.plug \
demofiles.plug \
file2pacDep.plug \
@@ -12,6 +13,7 @@
\

SCRIPTS := \
+ compat_digest.sh \
demo.sh \
demofiles.sh \
file2pacDep.sh \
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 1970-01-01 01:00:00.000000000 +0100
+++ new/plugins/compat_digest.plug 2009-11-11 21:33:49.000000000 +0100
@@ -0,0 +1,23 @@
+###############################################################################
+# compat_digest
+# it's a part of the rpmrebuild project
+#
+# Copyright (C) 2002 by Eric Gerbier
+# Bug reports to: gerbier@xxxxxxxxxxxxxxxxxxxxx
+# or : valery_reznic@xxxxxxxxxxxxxxxxxxxxx
+# $Id: compat_digest.plug 624 2009-11-11 20:33:41Z 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.
+#
+###############################################################################
+# include file for compat_digest plugin
+
+change-spec-preamble compat_digest.sh
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 1970-01-01 01:00:00.000000000 +0100
+++ new/plugins/compat_digest.sh 2009-11-11 21:33:49.000000000 +0100
@@ -0,0 +1,91 @@
+#!/bin/bash
+###############################################################################
+# compat_digest.sh
+# it's a part of the rpmrebuild project
+#
+# Copyright (C) 2004 by Eric Gerbier
+# Bug reports to: gerbier@xxxxxxxxxxxxxxxxxxxxx
+# or : valery_reznic@xxxxxxxxxxxxxxxxxxxxx
+# $Id: compat_digest.sh 624 2009-11-11 20:33:41Z 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.
+#
+###############################################################################
+
+version=1.0
+###############################################################################
+function msg () {
+ echo >&2 $*
+}
+###############################################################################
+function syntaxe () {
+ msg "this plugin will force rpm digest to be compatible with rpm 4.4
release"
+ msg "it must be called with change-spec-preamble option"
+ msg "-h|--help : this help"
+ msg "-v|--version : print plugin version"
+ exit 1
+
+}
+###############################################################################
+
+# test for arguments
+if [ $# -ne 0 ]
+then
+ case $1 in
+
+ -h | --help )
+ syntaxe
+ ;;
+
+ -v | --version )
+ msg "$0 version $version";
+ exit 1;
+ ;;
+
+ *)
+ msg "bad option : $1";
+ syntaxe
+ ;;
+ esac
+fi
+
+# test the way to be called
+case $LONG_OPTION in
+ change-spec-preamble*)
+ ;;
+ *) msg "should be called from LONG_OPTION=change-spec-preamble";
+ syntaxe
+ ;;
+esac
+
+# Fedora 11 default setup uses SHA256 file hashes, which
+# rpm 4.4.x (suse, ...) doesn't understand
+# The used hash is build-time configurable macro, so to
+# turn it back to compatible-everywhere MD5 hashes you can set
+# %_source_filedigest_algorithm %_binary_filedigest_algorithm macros
+# to value of 1
+# for example add in spec
+# %global _binary_filedigest_algorithm 1
+# %global _source_filedigest_algorithm 1
+
+# just repeat old spec
+while read line
+do
+ # todo : test if previous spec already contains filedigest macro
+ echo "$line"
+done
+
+# add new lines
+echo "# compat_digest plugin"
+echo "%global _binary_filedigest_algorithm 1"
+echo "%global _source_filedigest_algorithm 1"
+echo "# end of compat_digest plugin"
+echo ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plugins/demo.sh new/plugins/demo.sh
--- old/plugins/demo.sh 2007-12-07 09:45:13.000000000 +0100
+++ new/plugins/demo.sh 2009-11-13 14:38:05.000000000 +0100
@@ -6,7 +6,7 @@
# Copyright (C) 2004 by Eric Gerbier
# Bug reports to: gerbier@xxxxxxxxxxxxxxxxxxxxx
# or : valery_reznic@xxxxxxxxxxxxxxxxxxxxx
-# $Id: demo.sh 544 2007-11-27 09:10:14Z gerbier $
+# $Id: demo.sh 627 2009-11-13 13:38:02Z 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
@@ -21,7 +21,7 @@
###############################################################################
# code's file of demo plugin for rpmrebuild

-version=1.0
+version=1.1
###############################################################################
function msg () {
echo >&2 $*
@@ -71,7 +71,6 @@
;;
esac

-liste=""
while read line
do
if [ -n "$opt_null" ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plugins/man/en/compat_digest.plug.1rrp.in
new/plugins/man/en/compat_digest.plug.1rrp.in
--- old/plugins/man/en/compat_digest.plug.1rrp.in 1970-01-01
01:00:00.000000000 +0100
+++ new/plugins/man/en/compat_digest.plug.1rrp.in 2009-12-11
09:55:39.000000000 +0100
@@ -0,0 +1,66 @@
+.TH "compat_digest.plug" "1" "@VERSION@" "Eric Gerbier" "rpmrebuild plugin"
+.SH "NAME"
+compat_digest.plug \- a plugin for rpmrebuild, for digest compatibility with
rpm 4.4x
+.SH "SYNOPSIS"
+.br
+rpmrebuild \-\-change\-spec\-preamble="compat_digest.sh <\fIpackagename\fP>
+.br
+or
+.br
+rpmrebuild \-\-include compat_digest.plug <\fIpackagename\fP>
+
+.SH "DESCRIPTION"
+this plugin force the rpm internal digest to be compatible with rpm 4.4.x
+.SH "OPTIONS"
+.TP
+\fB\-h, \-\-help\fP
+output help information plugins option and exit.
+.TP
+\fB\-v, \-\-version\fP
+print plugin version and exit
+.SH "FILES"
+.TP
+\fBcompat_digest.sh\fP
+contains the code for change\-spec\-preamble
+.TP
+\fBcompat_digest.plug\fP
+
+.TP
+\fBcompat_digest.plug.1\fP
+is this man page
+.SH "ENVIRONMENT"
+.br
+.SH "EXAMPLES"
+.LP
+\fBrpmrebuild \-\-change\-spec\-preamble="compat_digest.sh apache\fP
+
+you can do the same with the following syntax
+
+.br
+rpmrebuild \-\-include compat_digest.plug apache
+
+.SH "AUTHORS"
+.LP
+Eric Gerbier <gerbier@xxxxxxxxxxxxxxxxxxxxx>
+.TP
+See <URL:http://rpmrebuild.sourceforge.net/>.
+.SH "NOTES"
+.LP
+.TP
+this can also be done by the \-\-md5\-compat\-digest core option
+
+.SH "COPYRIGHT"
+.LP
+rpmrebuild is copyright (C) 2008 by Eric Gerbier.
+.br
+this program is distributed under GNU General Public License
+.br
+It is provided "as is", without any express or implied
+warranties. See the file COPYING for details.
+.SH "SEE ALSO"
+.LP
+rpm(8), rpmbuild(8), rpmrebuild_plugins(1), demo.plug(1), demofiles.plug(1),
nodoc.plug(1), uniq.plug(1), file2pacDep.plug(1),
+.br
+man \-k rrp for plugins specific manpages
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plugins/man/en/set_tag.plug.1rrp.in
new/plugins/man/en/set_tag.plug.1rrp.in
--- old/plugins/man/en/set_tag.plug.1rrp.in 2008-04-03 08:21:13.000000000
+0200
+++ new/plugins/man/en/set_tag.plug.1rrp.in 2009-11-13 14:43:08.000000000
+0100
@@ -63,7 +63,7 @@
.SH "NOTES"
.LP
.TP
-this plugin does not provide a set_tag.plug, because this form does not allow
to pass arguments to the plugin
+a very simple but real plugin
.SH "COPYRIGHT"
.LP
rpmrebuild is copyright (C) 2008 by Eric Gerbier.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plugins/man/fr_FR/compat_digest.plug.1rrp.in
new/plugins/man/fr_FR/compat_digest.plug.1rrp.in
--- old/plugins/man/fr_FR/compat_digest.plug.1rrp.in 1970-01-01
01:00:00.000000000 +0100
+++ new/plugins/man/fr_FR/compat_digest.plug.1rrp.in 2009-11-20
10:25:15.000000000 +0100
@@ -0,0 +1,65 @@
+.TH "compat_digest.plug" "1" "@VERSION@" "Eric Gerbier" "rpmrebuild plugin"
+.SH "NAME"
+compat_digest.plug \- un plugin de rpmrebuild, pour une compatibilit� des
hashages md5 avec rpm version 4.4x
+.SH "SYNOPSIS"
+.br
+rpmrebuild \-\-change\-spec\-preamble="compat_digest.sh <\fIpackagename\fP>
+.br
+ou
+.br
+rpmrebuild \-\-include compat_digest.plug <\fIpackagename\fP>
+
+.SH "DESCRIPTION"
+ce plugin force les checksum internes de rpm � �tre compatible avec rpm 4.4.x
+.SH "OPTIONS"
+.TP
+\fB\-h, \-\-help\fP
+affiche de l'aide sur le plugin puis sort
+.TP
+\fB\-v, \-\-version\fP
+affiche la version du plugin version puis sort.
+.SH "FILES"
+.TP
+\fBcompat_digest.sh\fP
+contient le code pour change\-spec\-preamble
+.TP
+\fBcompat_digest.plug\fP
+le fichier d'inclusion
+.TP
+\fBcompat_digest.plug.1\fP
+cette documentation
+.SH "ENVIRONMENT"
+.br
+.SH "EXAMPLES"
+.LP
+\fBrpmrebuild \-\-change\-spec\-preamble="compat_digest.sh apache\fP
+
+ou
+
+.br
+rpmrebuild \-\-include compat_digest.plug apache
+
+.SH "AUTHORS"
+.LP
+Eric Gerbier <gerbier@xxxxxxxxxxxxxxxxxxxxx>
+.TP
+See <URL:http://rpmrebuild.sourceforge.net/>.
+.SH "NOTES"
+.LP
+.TP
+cette fonction est �galement disponible avec les options \-5 /
\-\-md5\-compat\-digest
+.SH "COPYRIGHT"
+.LP
+rpmrebuild is copyright (C) 2008 by Eric Gerbier.
+.br
+Ce programme est distribu� sous la licence GNU General Public.
+.br
+Il est fourni en l'�tat, sans garanties. Consultez le fichier COPYING
+pour plus de d�tails.
+.SH "SEE ALSO"
+.LP
+rpm(8), rpmbuild(8), rpmrebuild_plugins(1), demo.plug(1), demofiles.plug(1),
nodoc.plug(1), uniq.plug(1), file2pacDep.plug(1),
+.br
+man \-k rrp for plugins specific manpages
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plugins/man/fr_FR/demofiles.plug.1rrp.in
new/plugins/man/fr_FR/demofiles.plug.1rrp.in
--- old/plugins/man/fr_FR/demofiles.plug.1rrp.in 2008-04-03
08:29:36.000000000 +0200
+++ new/plugins/man/fr_FR/demofiles.plug.1rrp.in 2009-11-13
14:56:30.000000000 +0100
@@ -56,5 +56,3 @@
.SH "SEE ALSO"
.LP
rpm(8), rpmbuild(8), rpmrebuild_plugins(1), demo.plug(1), demofiles.plug(1),
nodoc.plug(1), uniq.plug(1), file2pacDep.plug(1), set_tag.plug(1), 'man \-k
rrp' pour la doc sur les plugins.
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plugins/man/fr_FR/set_tag.plug.1rrp.in
new/plugins/man/fr_FR/set_tag.plug.1rrp.in
--- old/plugins/man/fr_FR/set_tag.plug.1rrp.in 2008-04-03 08:28:55.000000000
+0200
+++ new/plugins/man/fr_FR/set_tag.plug.1rrp.in 2009-11-13 14:50:31.000000000
+0100
@@ -59,7 +59,8 @@
.SH "NOTES"
.LP
.TP
-ce plugin est donn� en l'�tat � titre d'exemple
+un plugin simple mais utile
+
.SH "COPYRIGHT"
.LP
rpmrebuild is copyright (C) 2008 by Eric Gerbier.
@@ -71,6 +72,3 @@
.SH "SEE ALSO"
.LP
rpm(8), rpmbuild(8), rpmrebuild_plugins(1), demo.plug(1), demofiles.plug(1),
nodoc.plug(1), uniq.plug(1), file2pacDep.plug(1), set_tag.plug(1), 'man \-k
rrp' pour la doc sur les plugins.
-
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plugins/man/fr_FR.UTF-8/compat_digest.plug.1rrp.in
new/plugins/man/fr_FR.UTF-8/compat_digest.plug.1rrp.in
--- old/plugins/man/fr_FR.UTF-8/compat_digest.plug.1rrp.in 1970-01-01
01:00:00.000000000 +0100
+++ new/plugins/man/fr_FR.UTF-8/compat_digest.plug.1rrp.in 2009-11-20
10:16:40.000000000 +0100
@@ -0,0 +1,65 @@
+.TH "compat_digest.plug" "1" "@VERSION@" "Eric Gerbier" "rpmrebuild plugin"
+.SH "NAME"
+compat_digest.plug \- un plugin de rpmrebuild, pour une compatibilité des
hashages md5 avec rpm version 4.4x
+.SH "SYNOPSIS"
+.br
+rpmrebuild \-\-change\-spec\-preamble="compat_digest.sh <\fIpackagename\fP>
+.br
+ou
+.br
+rpmrebuild \-\-include compat_digest.plug <\fIpackagename\fP>
+
+.SH "DESCRIPTION"
+ce plugin force les checksum internes de rpm à être compatible avec rpm 4.4.x
+.SH "OPTIONS"
+.TP
+\fB\-h, \-\-help\fP
+affiche de l'aide sur le plugin puis sort
+.TP
+\fB\-v, \-\-version\fP
+affiche la version du plugin version puis sort.
+.SH "FILES"
+.TP
+\fBcompat_digest.sh\fP
+contient le code pour change\-spec\-preamble
+.TP
+\fBcompat_digest.plug\fP
+le fichier d'inclusion
+.TP
+\fBcompat_digest.plug.1\fP
+cette documentation
+.SH "ENVIRONMENT"
+.br
+.SH "EXAMPLES"
+.LP
+\fBrpmrebuild \-\-change\-spec\-preamble="compat_digest.sh apache\fP
+
+ou
+
+.br
+rpmrebuild \-\-include compat_digest.plug apache
+
+.SH "AUTHORS"
+.LP
+Eric Gerbier <gerbier@xxxxxxxxxxxxxxxxxxxxx>
+.TP
+See <URL:http://rpmrebuild.sourceforge.net/>.
+.SH "NOTES"
+.LP
+.TP
+cette fonction est également disponible avec les options \-5 /
\-\-md5\-compat\-digest
+.SH "COPYRIGHT"
+.LP
+rpmrebuild is copyright (C) 2008 by Eric Gerbier.
+.br
+Ce programme est distribué sous la licence GNU General Public.
+.br
+Il est fourni en l'état, sans garanties. Consultez le fichier COPYING
+pour plus de détails.
+.SH "SEE ALSO"
+.LP
+rpm(8), rpmbuild(8), rpmrebuild_plugins(1), demo.plug(1), demofiles.plug(1),
nodoc.plug(1), uniq.plug(1), file2pacDep.plug(1),
+.br
+man \-k rrp for plugins specific manpages
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plugins/man/fr_FR.UTF-8/demofiles.plug.1rrp.in
new/plugins/man/fr_FR.UTF-8/demofiles.plug.1rrp.in
--- old/plugins/man/fr_FR.UTF-8/demofiles.plug.1rrp.in 2008-04-03
08:28:12.000000000 +0200
+++ new/plugins/man/fr_FR.UTF-8/demofiles.plug.1rrp.in 2009-11-13
14:56:23.000000000 +0100
@@ -56,5 +56,3 @@
.SH "SEE ALSO"
.LP
rpm(8), rpmbuild(8), rpmrebuild_plugins(1), demo.plug(1), demofiles.plug(1),
nodoc.plug(1), uniq.plug(1), file2pacDep.plug(1), set_tag.plug(1), 'man \-k
rrp' pour la doc sur les plugins.
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plugins/man/fr_FR.UTF-8/set_tag.plug.1rrp.in
new/plugins/man/fr_FR.UTF-8/set_tag.plug.1rrp.in
--- old/plugins/man/fr_FR.UTF-8/set_tag.plug.1rrp.in 2008-04-03
08:27:59.000000000 +0200
+++ new/plugins/man/fr_FR.UTF-8/set_tag.plug.1rrp.in 2009-11-13
14:50:30.000000000 +0100
@@ -59,7 +59,8 @@
.SH "NOTES"
.LP
.TP
-ce plugin est donné en l'état à titre d'exemple
+un plugin simple mais utile
+
.SH "COPYRIGHT"
.LP
rpmrebuild is copyright (C) 2008 by Eric Gerbier.
@@ -71,6 +72,3 @@
.SH "SEE ALSO"
.LP
rpm(8), rpmbuild(8), rpmrebuild_plugins(1), demo.plug(1), demofiles.plug(1),
nodoc.plug(1), uniq.plug(1), file2pacDep.plug(1), set_tag.plug(1), 'man \-k
rrp' pour la doc sur les plugins.
-
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmrebuild.files new/rpmrebuild.files
--- old/rpmrebuild.files 2008-12-11 17:25:21.000000000 +0100
+++ new/rpmrebuild.files 2009-12-11 10:36:00.000000000 +0100
@@ -19,6 +19,8 @@
%dir /usr/lib/rpmrebuild/locale/en
/usr/lib/rpmrebuild/locale/en/rpmrebuild.lang
%dir /usr/lib/rpmrebuild/plugins
+ /usr/lib/rpmrebuild/plugins/compat_digest.plug
+ /usr/lib/rpmrebuild/plugins/compat_digest.sh
/usr/lib/rpmrebuild/plugins/demo.plug
/usr/lib/rpmrebuild/plugins/demo.sh
/usr/lib/rpmrebuild/plugins/demofiles.plug
@@ -37,6 +39,9 @@
%doc /usr/share/man/man1/rpmrebuild_plugins.1*
%doc /usr/share/man/fr_FR/man1/rpmrebuild_plugins.1*
%doc /usr/share/man/fr_FR.UTF-8/man1/rpmrebuild_plugins.1*
+%doc /usr/share/man/man1/compat_digest.plug.1rrp*
+%doc /usr/share/man/fr_FR/man1/compat_digest.plug.1rrp*
+%doc /usr/share/man/fr_FR.UTF-8/man1/compat_digest.plug.1rrp*
%doc /usr/share/man/man1/demo.plug.1rrp*
%doc /usr/share/man/fr_FR/man1/demo.plug.1rrp*
%doc /usr/share/man/fr_FR.UTF-8/man1/demo.plug.1rrp*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmrebuild.lsm new/rpmrebuild.lsm
--- old/rpmrebuild.lsm 2008-08-08 16:26:58.000000000 +0200
+++ new/rpmrebuild.lsm 2009-12-11 09:20:50.000000000 +0100
@@ -1,7 +1,7 @@
Begin4
Title: rpmrebuild
-Version: 2.2.3-1
-Entered-date: 2008-08-07
+Version: 2.4-1
+Entered-date: 2009-12-11
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: gerbier@xxxxxxxxxxxxxxxxxxxxx (Eric Gerbier)
valery_reznic@xxxxxxxxxxxxxxxxxxxxx (Valery Reznic)
Primary-site: http://rpmrebuild.sourceforge.net
- 90 ko rpmrebuild-2.2.2-1rpm4.noarch.rpm
+ 90 ko rpmrebuild-2.3-1rpm.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.spc new/rpmrebuild.spc
--- old/rpmrebuild.spc 2008-12-16 18:07:13.000000000 +0100
+++ new/rpmrebuild.spc 2009-12-11 10:39:20.000000000 +0100
@@ -22,6 +22,9 @@
Requires: rpm >= 4.0, /usr/bin/rpmbuild
Release: %{release}

+%global _binary_filedigest_algorithm 1
+%global _source_filedigest_algorithm 1
+
%description
rpmrebuild allow to build an rpm file from an installed rpm, or from
another rpm file, with or without changes (batch or interactive).
@@ -30,11 +33,11 @@
change.

%description -l fr
-rpmbuild permet de fabriquer un package rpm � partir d'un
-package install� ou d'un fichier rpm, avec ou sans modifications
+rpmbuild permet de fabriquer un package rpm à partir d'un
+package installé ou d'un fichier rpm, avec ou sans modifications
(interactives ou batch).
-Un syst�me de plugin permet d'�tendre ses fonctionnalit�s.
-Une utilisation typique est la fabrication d'un package suite � des
modifications
+Un système de plugin permet d'étendre ses fonctionnalités.
+Une utilisation typique est la fabrication d'un package suite à des
modifications
de configuration.

%prep
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmrebuild.spec new/rpmrebuild.spec
--- old/rpmrebuild.spec 2009-01-09 11:42:07.000000000 +0100
+++ new/rpmrebuild.spec 2009-12-11 10:40:38.000000000 +0100
@@ -1,4 +1,4 @@
-Version: 2.3
+Version: 2.4
%define release 1
# Initial spec file created by autospec ver. 0.6 with rpm 2.5 compatibility
Summary: A tool to build rpm file from rpm database
@@ -24,6 +24,9 @@
Requires: rpm >= 4.0, /usr/bin/rpmbuild
Release: %{release}

+%global _binary_filedigest_algorithm 1
+%global _source_filedigest_algorithm 1
+
%description
rpmrebuild allow to build an rpm file from an installed rpm, or from
another rpm file, with or without changes (batch or interactive).
@@ -32,11 +35,11 @@
change.

%description -l fr
-rpmbuild permet de fabriquer un package rpm � partir d'un
-package install� ou d'un fichier rpm, avec ou sans modifications
+rpmbuild permet de fabriquer un package rpm à partir d'un
+package installé ou d'un fichier rpm, avec ou sans modifications
(interactives ou batch).
-Un syst�me de plugin permet d'�tendre ses fonctionnalit�s.
-Une utilisation typique est la fabrication d'un package suite � des
modifications
+Un système de plugin permet d'étendre ses fonctionnalités.
+Une utilisation typique est la fabrication d'un package suite à des
modifications
de configuration.

%prep
@@ -55,6 +58,12 @@
%files -f rpmrebuild.files

%changelog
+* Fri Dec 11 2009 <gerbier@xxxxxxxxxxxxxxxxxxxxx> 2.4
+- add -l / --list-plugin option
+
+* Tue Nov 12 2009 <valery_reznic@xxxxxxxxxxxxxxxxxxxxx>
+- add -5 / --md5-compat-digest option
+
* Wed Jan 09 2009 <gerbier@xxxxxxxxxxxxxxxxxxxxx> 2.3
- release version 2.3

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpmrebuild_parser.src new/rpmrebuild_parser.src
--- old/rpmrebuild_parser.src 2008-12-19 09:05:02.000000000 +0100
+++ new/rpmrebuild_parser.src 2009-11-20 09:42:09.000000000 +0100
@@ -3,7 +3,7 @@
#
# Copyright (C) 2002 by Eric Gerbier
# Bug reports to: gerbier@xxxxxxxxxxxxxxxxxxxxx
-# $Id: rpmrebuild_parser.src 610 2008-12-16 13:34:38Z valery_reznic $
+# $Id: rpmrebuild_parser.src 632 2009-11-20 08:42:24Z 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
@@ -22,6 +22,7 @@
Echo "$name $UsageTitle
$UsageUsage: $name [options] package
options:
+ -5 --md5-compat-digest $UsageMd5CompatDigest
-a, --additional=<flags> $UsageAdditional
-b, --batch $UsageBatch
-c, --comment-missing=<y|n> $UsageCommentMissing
@@ -33,6 +34,7 @@
-k, --keep-perm $UsageKeepPerm
--pug-from-fs $UsagePugFs
--pug-from-db (default) $UsagePugDb
+ -l, --list-plugin $UsageListPlug
-m, --modify=<command> $UsageModify
-n, --notest-install $UsageNoTestInstall
-p, --package $UsagePackage
@@ -103,6 +105,21 @@
"

}
+function List_Plugins
+{
+ plugindir=$( dirname $0)/plugins
+ for f in $plugindir/*.plug
+ do
+ plug=$(basename $f)
+ text=$(man $plug | awk 'NR==6{print}' )
+ if [ -n "$text" ]
+ then
+ echo "$text"
+ else
+ echo "$plug"
+ fi
+ done
+}
###############################################################################
function Try_Help
{
@@ -137,6 +154,27 @@
return 1
}
###############################################################################
+function Include
+{
+ while :; do
+ read LONG_OPTION OPTARG || break
+ OPTARG_EXIST="$OPTARG"
+ case "x$LONG_OPTION" in
+ x#*)
+ : # comment, do nothing
+ ;;
+
+ x)
+ : # empty, do nothing
+ ;;
+
+ *)
+ ProcessLongOptions || return
+ ;;
+ esac || return
+ done < $INCLUDE_FILE
+}
+###############################################################################
function ProcessLongOptions
{
# Get "full" long option
@@ -627,7 +665,43 @@
LONG_OPTION='pug-from-fs' # alias
;;

- m | \
+ l | \
+ li | \
+ lis | \
+ list | \
+ list- | \
+ list-p | \
+ list-pl | \
+ list-plu | \
+ list-plug | \
+ list-plugi | \
+ list-plugin) \
+ LONG_OPTION='list-plugin'
+ ;;
+
+ m)
+ AmbiguousOption
+ return 1
+ ;;
+ md | \
+ md5 | \
+ md5- | \
+ md5-c | \
+ md5-co | \
+ md5-com | \
+ md5-comp | \
+ md5-compa | \
+ md5-compat | \
+ md5-compat- | \
+ md5-compat-d | \
+ md5-compat-di | \
+ md5-compat-dig | \
+ md5-compat-dige | \
+ md5-compat-diges | \
+ md5-compat-digest)
+ LONG_OPTION='md5-compat-digest'
+ ;;
+
mo | \
mod | \
modi | \
@@ -871,25 +945,21 @@
Error "$FileNotFound : '$OPTARG'"
return 1
fi
- while :; do
- read LONG_OPTION OPTARG || break
- OPTARG_EXIST="$OPTARG"
- case "x$LONG_OPTION" in
- x#*)
- : # comment, do nothing
- ;;
-
- x)
- : # empty, do nothing
- ;;
-
- *)
- ProcessLongOptions ||
return
- ;;
- esac || return
- done < $INCLUDE_FILE || return
+ Include || return
+ ;;
+
+ list-plugin)
+ List_Plugins
+ NEED_EXIT=0
+ return 0
;;

+ md5-compat-digest)
+ md5_compat_digest="yes"
+ # or by plugin :
+
#INCLUDE_FILE="$RPMREBUILD_PLUGINS_DIR/compat_digest.plug"
+ #Include || return
+ ;;
notest-install)
NOTESTINSTALL=1
;;
@@ -957,6 +1027,7 @@
autorequire="no"
batch="no"
debug=""
+ md5_compat_digest="no"
need_change_files="no"
need_change_spec="no"
rpm_defines=""
@@ -976,9 +1047,10 @@

export LONG_OPTION

- while getopts "a:bc:d:D:ef:hi:km:npPRrs:vVwy:-:" opt; do
+ while getopts "5a:bc:d:D:ef:hi:klm:npPRrs:vVwy:-:" opt; do
OPTIND_INCR=""
case "$opt" in
+ 5) LONG_OPTION=md5-compat-digest;;
a) LONG_OPTION=additional;;
b) LONG_OPTION=batch;;
c) LONG_OPTION=comment-missing;;
@@ -988,6 +1060,7 @@
f) LONG_OPTION=filter;;
i) LONG_OPTION=include;;
k) LONG_OPTION=keep-perm;;
+ l) LONG_OPTION=list-plugin;;
m) LONG_OPTION=modify;;
n) LONG_OPTION=notest-install;;
p) LONG_OPTION=package;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/spec_func.src new/spec_func.src
--- old/spec_func.src 2008-12-11 17:25:56.000000000 +0100
+++ new/spec_func.src 2009-11-13 14:20:46.000000000 +0100
@@ -1,8 +1,8 @@
#!/bin/bash
###############################################################################
-# Copyright (C) 2004 by Valery Reznic
+# Copyright (C) 2004, 2009 by Valery Reznic
# This file is a part of the rpmrebuild project
-# $Id: spec_func.src 598 2008-12-08 15:17:07Z gerbier $
+# $Id: spec_func.src 626 2009-11-12 14:42:49Z 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
@@ -36,6 +36,17 @@
echo '#undefine __find_provides'
fi
}
+
+function spec_md5_compat_digest
+{
+ if [ "X$md5_compat_digest" = "Xno" ]; then
+ : # Do nothing
+ else
+ echo "%global _binary_filedigest_algorithm 1"
+ echo "%global _source_filedigest_algorithm 1"
+ fi
+}
+
###############################################################################
function spec_query
{
@@ -131,6 +142,7 @@
fi
spec_auto_prov || return
spec_auto_req || return
+ spec_md5_compat_digest || return

cat <<-SPEC_DEFS || return
# Do not try autogenerate prereq/conflicts/obsoletes and check
files
@@ -171,12 +183,15 @@
local sed_post="/^%%post/s/^%%/%/1"
# %%verifyscript -> %verifyscript (in begin of line)
local sed_verifyscript="/^%%verifyscript/s/^%%/%/1"
+ # %%global
+ local sed_global="/^%%global/s/^%%/%/1"
sed \
-e "$sed_double_percent" \
-e "$sed_trigger" \
-e "$sed_pre" \
-e "$sed_post" \
-e "$sed_verifyscript" \
+ -e "$sed_global" \
$SPEC_TRIGGERS.$si_triggers \
$SPEC_PRE.$si_pre \
$SPEC_POST.$si_post \


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages