Hello community, here is the log from the commit of package rpmrebuild for openSUSE:Factory checked in at Thu Oct 13 19:43:44 CEST 2011.
-------- --- openSUSE:Factory/rpmrebuild/rpmrebuild.changes 2011-09-23 12:44:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpmrebuild/rpmrebuild.changes 2011-10-13 14:45:30.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Oct 13 12:42:06 UTC 2011 - [email protected] + +- Update to version 2.6 +- spec cleaner +- Remove redundant tags/sections from specfile + (cf. packaging guidelines) +- Use %_smp_mflags for parallel build- + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rpmrebuild-2.4.tar.bz2 New: ---- rpmrebuild-2.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmrebuild.spec ++++++ --- /var/tmp/diff_new_pack.5S0dEH/_old 2011-10-13 19:43:40.000000000 +0200 +++ /var/tmp/diff_new_pack.5S0dEH/_new 2011-10-13 19:43:40.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package rpmrebuild (Version 2.4) +# spec file for package rpmrebuild # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,21 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: rpmrebuild -License: GPLv2+ -Group: System/Packages -AutoReqProv: on -Version: 2.4 +Version: 2.6 Release: 1 +License: GPLv2+ Summary: A tool to build a rpm file from the rpm database Url: http://rpmrebuild.sourceforge.net -Source: %name-%version.tar.bz2 +Group: System/Packages +Source: %{name}-%{version}.tar.bz2 +Requires: bash +Requires: coreutils +Requires: cpio +Requires: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Requires: bash cpio coreutils sed %description rpmrebuild allows to build an rpm file from an installed rpm, or from @@ -37,32 +38,22 @@ can be extended by a plugin system. A typical use is to easy repackage a software after some configuration's change. - - -Authors: --------- - Eric Gerbier <[email protected]> - Valery Reznic <[email protected]> - %prep %setup -q -c %build -make +%__make %{?_smp_mflags}; %install -make "DESTDIR=$RPM_BUILD_ROOT" install -mv $RPM_BUILD_ROOT%_mandir/fr_FR.UTF-8/ $RPM_BUILD_ROOT%_mandir/fr -rm -rf $RPM_BUILD_ROOT%_mandir/fr_FR/ - -%clean -rm -rf $RPM_BUILD_ROOT +%makeinstall "DESTDIR=%{buildroot}" +mv %{buildroot}%{_mandir}/fr_FR.UTF-8/ %{buildroot}%{_mandir}/fr +rm -rf %{buildroot}%{_mandir}/fr_FR/ %files %defattr(-,root,root) -%_bindir/rpmrebuild -%_prefix/lib/rpmrebuild -%_mandir/fr/man1/* -%_mandir/man1/* +%{_bindir}/rpmrebuild +%{_prefix}/lib/rpmrebuild +%{_mandir}/fr/man1/* +%{_mandir}/man1/* %changelog ++++++ rpmrebuild-2.4.tar.bz2 -> rpmrebuild-2.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Changelog new/Changelog --- old/Changelog 2009-12-11 09:53:36.000000000 +0100 +++ new/Changelog 2011-07-12 10:06:45.000000000 +0200 @@ -1,3 +1,14 @@ +* Tue Jul 12 2011 <[email protected]> 2.6 +- fix bug when working on source packages + +* Fri Apr 15 2011 <[email protected]> 2.5 +- add -5/-l options in man pages +- Added support for obsolete version and flags (bugfix by Valery Reznic) +- shell compatibility (mkdir) for AIX : use -p option instead --parents +- new Mkdir_p function to check for mkdir result +- apply patch from ndyankov : support for broken symlinks +- specfile will allow build package for rpm version 4 or 3 + * Fri Dec 11 2009 <[email protected]> 2.4 - add -l / --list-plugin option diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Makefile new/Makefile --- old/Makefile 2008-12-19 09:05:02.000000000 +0100 +++ new/Makefile 2011-07-12 10:06:45.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile 609 2008-12-14 16:30:40Z valery_reznic $ +# $Id: Makefile 688 2011-07-11 12:36:37Z gerbier $ # TOP_DIR := . include $(TOP_DIR)/Makefile.include @@ -29,6 +29,7 @@ rpmrebuild_ghost.sh \ INCLUDE_SCRIPTS := \ + rpmrebuild_lib.src \ processing_func.src \ rpmrebuild_rpmqf.src \ rpmrebuild_parser.src \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Makefile.include new/Makefile.include --- old/Makefile.include 2007-11-08 19:12:41.000000000 +0100 +++ new/Makefile.include 2010-09-23 09:19:19.000000000 +0200 @@ -3,7 +3,7 @@ INSTALL_MAN := install --mode=644 INSTALL_LOCALE := install --mode=644 LN := ln --symbolic --force --no-dereference -MKDIR := mkdir --parents +MKDIR := mkdir -p RM := rm --force RMDIR := rm --force --recursive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/News new/News --- old/News 2009-12-11 09:49:32.000000000 +0100 +++ new/News 2011-04-15 15:10:36.000000000 +0200 @@ -1,3 +1,4 @@ +* 2011-04-15 : release 2.5-1, patch from ndyankov : support for broken symlinks, will work on AIX with rpm 3 * 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Version new/Version --- old/Version 2009-12-11 09:20:55.000000000 +0100 +++ new/Version 2011-06-24 14:55:40.000000000 +0200 @@ -1 +1 @@ -2.4 +2.6 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 2009-11-11 21:00:42.000000000 +0100 +++ new/man/en/rpmrebuild.1.in 2011-04-10 13:39:20.000000000 +0200 @@ -10,6 +10,9 @@ just have your change on installed files and call rpmrebuild. .SH "OPTIONS" .TP +\fB\-5 \-\-md5\-compat\-digest\fP +use rpm 4.4 compatible digest (md5) +.TP \fB\-a, \-\-additional\fP=<\fIflags\fP> pass additional flags to \fBrpmbuild\fP .TP @@ -43,6 +46,9 @@ \fB\-k, \-\-keep\-perm alias to \fB\-\-pug\-from\-fs\fP .TP +\fB\-l, \-\-list\-plugin\fP +list installed plugins +.TP \fB\-m, \-\-modify\fP=<\fIcommand\fP> alias to \fB\-\-change\-files .TP 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 2009-01-09 11:30:29.000000000 +0100 +++ new/man/fr_FR/rpmrebuild.1.in 2011-04-10 13:44:30.000000000 +0200 @@ -8,6 +8,9 @@ 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. .SH "OPTIONS" .TP +\fB\-5 \-\-md5\-compat\-digest\fP +passe en mode compatible avec les checksum de rpm 4.4 (md5) +.TP \fB\-a, \-\-additional\fP=<\fIflags\fP> passe des options (flags) sp�cifiques pour \fBrpmbuild\fP .TP @@ -41,6 +44,9 @@ \fB\-k, \-\-keep\-perm alias de l'option \fB\-\-pug\-from\-fs\fP .TP +\fB\-l, \-\-list\-plugin\fP +liste les plugins install�s +.TP \fB\-m, \-\-modify\fP=<\fIcommand\fP> alias de l'option \fB\-\-change\-files .TP @@ -237,24 +243,24 @@ \fBrpmrebuild \-\-batch package\fP .LP Construire un package modifi� : -.LP +.LP \fBrpmrebuild \-\-keep\-perm package\fP -.LP +.LP Construire un rpm � partir d'un fichier rpm en y appliquant un filtre : -.LP +.LP \fBrpmrebuild \-\-package \-\-filter filter /some/place/package.rpm\fP .LP Passer des options pour rpm: -recontruire et signer le package bash -.LP +reconstruire et signer le package bash +.LP \fBrpmrebuild \-\-additional "\-\-sign" bash\fP -.LP +.LP reconstruire un package compatible avec rpm version 3 (legacy) -.LP +.LP \fBrpmrebuild \-\-additional "\-\-nodirtokens" package\fP -.LP +.LP Donner un nom pour le fichier rpm g�n�r�: -.LP +.LP \fBrpmrebuild \-\-define "_rpmfilename %%{NAME}.rpm" bash\fP .LP Modification interactive du package: 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 2009-01-09 11:31:14.000000000 +0100 +++ new/man/fr_FR.UTF-8/rpmrebuild.1.in 2011-04-10 13:43:13.000000000 +0200 @@ -8,6 +8,9 @@ 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. .SH "OPTIONS" .TP +\fB\-5 \-\-md5\-compat\-digest\fP +passe en mode compatible avec les checksum de rpm 4.4 (md5) +.TP \fB\-a, \-\-additional\fP=<\fIflags\fP> passe des options (flags) spécifiques pour \fBrpmbuild\fP .TP @@ -41,6 +44,9 @@ \fB\-k, \-\-keep\-perm alias de l'option \fB\-\-pug\-from\-fs\fP .TP +\fB\-l, \-\-list\-plugin\fP +liste les plugins installés +.TP \fB\-m, \-\-modify\fP=<\fIcommand\fP> alias de l'option \fB\-\-change\-files .TP @@ -237,24 +243,24 @@ \fBrpmrebuild \-\-batch package\fP .LP Construire un package modifié : -.LP +.LP \fBrpmrebuild \-\-keep\-perm package\fP -.LP +.LP Construire un rpm à partir d'un fichier rpm en y appliquant un filtre : -.LP +.LP \fBrpmrebuild \-\-package \-\-filter filter /some/place/package.rpm\fP .LP Passer des options pour rpm: -recontruire et signer le package bash -.LP +reconstruire et signer le package bash +.LP \fBrpmrebuild \-\-additional "\-\-sign" bash\fP -.LP +.LP reconstruire un package compatible avec rpm version 3 (legacy) -.LP +.LP \fBrpmrebuild \-\-additional "\-\-nodirtokens" package\fP -.LP +.LP Donner un nom pour le fichier rpm généré: -.LP +.LP \fBrpmrebuild \-\-define "_rpmfilename %%{NAME}.rpm" bash\fP .LP Modification interactive du package: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.files new/rpmrebuild.files --- old/rpmrebuild.files 2009-12-11 10:36:00.000000000 +0100 +++ new/rpmrebuild.files 2011-06-02 20:50:16.000000000 +0200 @@ -5,6 +5,7 @@ /usr/lib/rpmrebuild/processing_func.src /usr/lib/rpmrebuild/rpmrebuild.sh /usr/lib/rpmrebuild/rpmrebuild.usedtags + /usr/lib/rpmrebuild/rpmrebuild_lib.src /usr/lib/rpmrebuild/rpmrebuild_parser.src /usr/lib/rpmrebuild/rpmrebuild_rpmqf.src /usr/lib/rpmrebuild/rpmrebuild_files.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.lsm new/rpmrebuild.lsm --- old/rpmrebuild.lsm 2009-12-11 09:20:50.000000000 +0100 +++ new/rpmrebuild.lsm 2011-07-12 10:06:45.000000000 +0200 @@ -1,7 +1,7 @@ Begin4 Title: rpmrebuild -Version: 2.4-1 -Entered-date: 2009-12-11 +Version: 2.6-1 +Entered-date: 2011-07-12 Description: rpmrebuild creates spec files used by the Red Hat Package Manager in building RPM packages. It uses the information it can determine (from the rpm database) to fill in the proper spec file fields. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.sh new/rpmrebuild.sh --- old/rpmrebuild.sh 2008-12-19 09:05:02.000000000 +0100 +++ new/rpmrebuild.sh 2011-07-12 10:06:45.000000000 +0200 @@ -4,7 +4,7 @@ # # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] -# $Id: rpmrebuild.sh 613 2008-12-16 15:06:16Z valery_reznic $ +# $Id: rpmrebuild.sh 686 2011-07-11 12:32:40Z 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,63 +17,11 @@ # GNU General Public License for more details. # ############################################################################### -VERSION="$Id: rpmrebuild.sh 613 2008-12-16 15:06:16Z valery_reznic $" +VERSION="$Id: rpmrebuild.sh 686 2011-07-11 12:32:40Z gerbier $" # debug #set -x ############################################################################### -function Echo -{ - echo -e "$@" 1>&2 -} -############################################################################### -function Error -{ - Echo "$0: ERROR: $@" -} -############################################################################### - -function Warning -{ - # screen - Echo "$0: WARNING: $@" - # for optionnal bug report - echo -e "$0: WARNING: $@" >> $BUGREPORT - -} -############################################################################### - -function AskYesNo -{ - local Ans - echo -en "$@ ? (y/N) " 1>&2 - read Ans - case "x$Ans" in - x[yY]*) return 0;; - *) return 1;; - esac || return 1 # should not happened - return 1 # should not happend -} - -############################################################################### -function RmDir -{ - [ $# -ne 1 -o "x$1" = "x" ] && { - Echo "Usage: RmDir <dir>" - return 1 - } - # to ensure tmpdir is really emptied by rm -rf - local Dir - Dir="$1" - if [ -d $Dir ] - then - rm -rf "$Dir" 2>/dev/null && return - chmod -R 700 "$Dir" 2>/dev/null # no return here !!! - rm -rf "$Dir" || return - fi - return 0 -} -############################################################################### function SpecEdit { [ $# -ne 1 -o "x$1" = "x" ] && { @@ -156,7 +104,7 @@ rm --force $CPIO_TEMP || return rpm2cpio ${PAQUET} > $CPIO_TEMP || return rm --force --recursive $BUILDROOT || return - mkdir --parent $BUILDROOT || return + Mkdir_p $BUILDROOT || return (cd $BUILDROOT && cpio --quiet -idmu ) < $CPIO_TEMP || return rm --force $CPIO_TEMP || return # Process ghost files @@ -181,10 +129,16 @@ function RpmBuild { - # 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=rpmbuild + # rpmrebuild package dependency + # for rpm 3.x : use rpm + # for rpm 4.x : use rpmbuild + if [ -x /usr/bin/rpmbuild ] + then + local BUILDCMD=/usr/bin/rpmbuild + else + + local BUILDCMD=rpm + fi # rpm 4.6 ignore BuildRoot in the spec file, # so I have to provide define on the command line @@ -343,9 +297,12 @@ export RPMREBUILD_TMPDIR TMPDIR_WORK=$RPMREBUILD_TMPDIR/work + MY_LIB_DIR=`dirname $0` || return + source $MY_LIB_DIR/rpmrebuild_lib.src || return + # create tempory directories before any work/test RmDir "$RPMREBUILD_TMPDIR" || return - mkdir -p $TMPDIR_WORK || return + Mkdir_p $TMPDIR_WORK || return FIC_SPEC=$TMPDIR_WORK/spec FILES_IN=$TMPDIR_WORK/files.in @@ -353,7 +310,6 @@ # plugins for fs modification (--change-files) BUILDROOT=$TMPDIR_WORK/root - MY_LIB_DIR=`dirname $0` || return source $MY_LIB_DIR/rpmrebuild_parser.src || return source $MY_LIB_DIR/spec_func.src || return source $MY_LIB_DIR/processing_func.src || return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.spc new/rpmrebuild.spc --- old/rpmrebuild.spc 2009-12-11 10:39:20.000000000 +0100 +++ new/rpmrebuild.spc 2011-04-15 14:59:04.000000000 +0200 @@ -1,7 +1,8 @@ -# Initial spec file created by autospec ver. 0.6 with rpm 2.5 compatibility +%define is_rpm4 %( rpm_version="`rpm -q --queryformat='%{VERSION}' rpm | cut -f 1 -d.`"; if test $rpm_version == 4; then echo 1; else echo 0; fi) + +# The Summary: line should be expanded to about here -----^ Summary: A tool to build rpm file from rpm database Summary(fr): Un outil pour construire un package depuis une base rpm -# The Summary: line should be expanded to about here -----^ Name: rpmrebuild License: GPL Group: Development/Tools @@ -10,7 +11,7 @@ # Following are optional fields Url: http://rpmrebuild.sourceforge.net Packager: Eric Gerbier <[email protected]> -#Distribution: Red Hat Contrib-Net +#Distribution: BuildArchitectures: noarch Requires: bash Requires: cpio @@ -19,9 +20,16 @@ Requires: sed # sort Requires: textutils + +%if %{is_rpm4} Requires: rpm >= 4.0, /usr/bin/rpmbuild +%else +Requires: rpm < 4.0 +%endif + Release: %{release} +# compatibility with old digest format %global _binary_filedigest_algorithm 1 %global _source_filedigest_algorithm 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.spec new/rpmrebuild.spec --- old/rpmrebuild.spec 2009-12-11 10:40:38.000000000 +0100 +++ new/rpmrebuild.spec 2011-07-12 10:20:03.000000000 +0200 @@ -1,9 +1,10 @@ -Version: 2.4 +Version: 2.6 %define release 1 -# Initial spec file created by autospec ver. 0.6 with rpm 2.5 compatibility +%define is_rpm4 %( rpm_version="`rpm -q --queryformat='%{VERSION}' rpm | cut -f 1 -d.`"; if test $rpm_version == 4; then echo 1; else echo 0; fi) + +# The Summary: line should be expanded to about here -----^ Summary: A tool to build rpm file from rpm database Summary(fr): Un outil pour construire un package depuis une base rpm -# The Summary: line should be expanded to about here -----^ Name: rpmrebuild License: GPL Group: Development/Tools @@ -12,7 +13,7 @@ # Following are optional fields Url: http://rpmrebuild.sourceforge.net Packager: Eric Gerbier <[email protected]> -#Distribution: Red Hat Contrib-Net +#Distribution: BuildArchitectures: noarch Requires: bash Requires: cpio @@ -21,9 +22,16 @@ Requires: sed # sort Requires: textutils + +%if %{is_rpm4} Requires: rpm >= 4.0, /usr/bin/rpmbuild +%else +Requires: rpm < 4.0 +%endif + Release: %{release} +# compatibility with old digest format %global _binary_filedigest_algorithm 1 %global _source_filedigest_algorithm 1 @@ -58,6 +66,17 @@ %files -f rpmrebuild.files %changelog +* Tue Jul 12 2011 <[email protected]> 2.6 +- fix bug when working on source packages + +* Fri Apr 15 2011 <[email protected]> 2.5 +- add -5/-l options in man pages +- Added support for obsolete version and flags (bugfix by Valery Reznic) +- shell compatibility (mkdir) for AIX : use -p option instead --parents +- new Mkdir_p function to check for mkdir result +- apply patch from ndyankov : support for broken symlinks +- specfile will allow build package for rpm version 4 or 3 + * Fri Dec 11 2009 <[email protected]> 2.4 - add -l / --list-plugin option diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_buildroot.sh new/rpmrebuild_buildroot.sh --- old/rpmrebuild_buildroot.sh 2007-10-08 12:49:36.000000000 +0200 +++ new/rpmrebuild_buildroot.sh 2011-07-12 10:06:45.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2002, 2003 by Valery Reznic # Bug reports to: [email protected] # or : [email protected] -# $Id: rpmrebuild_buildroot.sh 265 2004-07-11 13:39:41Z valery_reznic $ +# $Id: rpmrebuild_buildroot.sh 687 2011-07-11 12:34:29Z gerbier $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -38,6 +38,9 @@ exit 1 } +MY_LIB_DIR=`dirname $0` || return +source $MY_LIB_DIR/rpmrebuild_lib.src || return + BuildRoot="$1" while :; do @@ -57,12 +60,12 @@ # I don't use --mode here, because it doesn't work # when directory already exist. file_perm="${file_perm#??}" - mkdir --parents $BuildRoot/$file || exit + Mkdir_p $BuildRoot/$file || exit chmod $file_perm $BuildRoot/$file || exit else # Not directory DirName=${file%/*} - mkdir --parents $BuildRoot/$DirName || exit + Mkdir_p $BuildRoot/$DirName || exit cp --preserve --no-dereference $file $BuildRoot/$file || exit fi done || exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_files.sh new/rpmrebuild_files.sh --- old/rpmrebuild_files.sh 2009-11-11 21:01:15.000000000 +0100 +++ new/rpmrebuild_files.sh 2011-04-10 13:24:45.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2002, 2003 by Valery Reznic # Bug reports to: [email protected] # or : [email protected] -# $Id: rpmrebuild_files.sh 546 2008-03-25 09:08:58Z gerbier $ +# $Id: rpmrebuild_files.sh 663 2011-04-10 11:24:44Z 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 @@ -89,7 +89,9 @@ if [ -e "$file" ]; then miss_str="" else + if [ ! -h "$file" ]; then miss_str='# MISSING: ' + fi fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_ghost.sh new/rpmrebuild_ghost.sh --- old/rpmrebuild_ghost.sh 2007-10-08 12:49:36.000000000 +0200 +++ new/rpmrebuild_ghost.sh 2011-07-12 10:06:45.000000000 +0200 @@ -6,7 +6,7 @@ # Copyright (C) 2002, 2003 by Valery Reznic # Bug reports to: [email protected] # or : [email protected] -# $Id: rpmrebuild_ghost.sh 278 2004-08-11 10:29:29Z valery_reznic $ +# $Id: rpmrebuild_ghost.sh 687 2011-07-11 12:34:29Z 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 @@ -39,6 +39,9 @@ exit 1 } +MY_LIB_DIR=`dirname $0` || return +source $MY_LIB_DIR/rpmrebuild_lib.src || return + BuildRoot="$1" while :; do @@ -67,10 +70,10 @@ [ -e "$File" ] && continue # File/directory already exist, do nothing if [ "X$file_type" = "Xd" ]; then # Directory. Ghost directory ? - mkdir --parents $File || exit + Mkdir_p $File || exit else # Not directory DirName=${File%/*} # Just in case dir for gjost file not exist - mkdir --parents $DirName || exit + Mkdir_p $DirName || exit # Create file itself > $File || exit fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_lib.src new/rpmrebuild_lib.src --- old/rpmrebuild_lib.src 1970-01-01 01:00:00.000000000 +0100 +++ new/rpmrebuild_lib.src 2011-06-02 22:04:38.000000000 +0200 @@ -0,0 +1,94 @@ +#!/bin/bash +############################################################################### +# 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 $ +# +# 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. +# +############################################################################### +# common functions for all scripts +############################################################################### + +function Echo +{ + echo -e "$@" 1>&2 +} +############################################################################### +function Error +{ + Echo "$0: ERROR: $@" +} +############################################################################### + +function Warning +{ + # screen + Echo "$0: WARNING: $@" + # for optionnal bug report + echo -e "$0: WARNING: $@" >> $BUGREPORT + +} +############################################################################### + +function AskYesNo +{ + local Ans + echo -en "$@ ? (y/N) " 1>&2 + read Ans + case "x$Ans" in + x[yY]*) return 0;; + *) return 1;; + esac || return 1 # should not happened + return 1 # should not happend +} + +############################################################################### +function RmDir +{ + [ $# -ne 1 -o "x$1" = "x" ] && { + Echo "Usage: RmDir <dir>" + return 1 + } + # to ensure tmpdir is really emptied by rm -rf + local Dir + Dir="$1" + if [ -d $Dir ] + then + rm -rf "$Dir" 2>/dev/null && return + chmod -R 700 "$Dir" 2>/dev/null # no return here !!! + rm -rf "$Dir" || return + fi + return 0 +} +############################################################################### +# on AIX the --parents does not exists for mkdir command, so use -p option +# which exists on all unix os +# but Non-GNU mkdir -p may have slightly different semantic and return status +# is not allways the same +function Mkdir_p +{ + [ $# -ne 1 -o "x$1" = "x" ] && { + Echo "Usage: Mkdir_p <dir>" + return 1 + } + local Dir + Dir="$1" + mkdir -p $Dir + # test result + if [ -d $Dir ] + then + return 0 + else + return 1 + fi +} +############################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_parser.src new/rpmrebuild_parser.src --- old/rpmrebuild_parser.src 2009-11-20 09:42:09.000000000 +0100 +++ new/rpmrebuild_parser.src 2011-04-08 15:53:35.000000000 +0200 @@ -3,7 +3,7 @@ # # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] -# $Id: rpmrebuild_parser.src 632 2009-11-20 08:42:24Z gerbier $ +# $Id: rpmrebuild_parser.src 661 2011-04-08 13:53:34Z 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 @@ -1163,7 +1163,7 @@ # There is rpmdir specified. # Let us find it's absolute path. # Yeah, a bit ugly, but simple and seems to work... - mkdir --parents -- "$rpmdir" # Not check exit status here + Mkdir_p "$rpmdir" # Not check exit status here rpmdir="$(cd $rpmdir && echo $PWD)" || { Error "$CannotChdir '$rpmdir'" return 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_rpmqf.src new/rpmrebuild_rpmqf.src --- old/rpmrebuild_rpmqf.src 2008-12-11 17:30:54.000000000 +0100 +++ new/rpmrebuild_rpmqf.src 2010-12-18 10:52:12.000000000 +0100 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2002 by Eric Gerbier # Bug reports to: [email protected] -# $Id: rpmrebuild_rpmqf.src 596 2008-12-08 15:06:04Z gerbier $ +# $Id: rpmrebuild_rpmqf.src 654 2010-12-15 16:01:09Z 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 @@ -69,7 +69,7 @@ } function qf_spec_obsoletes { -echo '%|OBSOLETES?{[Obsoletes: %{OBSOLETES}\n]}|' +echo '%|OBSOLETES?{[Obsoletes: %{OBSOLETES} %{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}\n]}|' } function qf_spec_provides { continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
