Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rpmrebuild for openSUSE:Factory checked in at 2024-07-01 11:21:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmrebuild (Old) and /work/SRC/openSUSE:Factory/.rpmrebuild.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmrebuild" Mon Jul 1 11:21:06 2024 rev:29 rq:1184079 version:2.18 Changes: -------- --- /work/SRC/openSUSE:Factory/rpmrebuild/rpmrebuild.changes 2023-01-28 19:03:55.068912589 +0100 +++ /work/SRC/openSUSE:Factory/.rpmrebuild.new.18349/rpmrebuild.changes 2024-07-01 11:21:45.374089765 +0200 @@ -1,0 +2,6 @@ +Sun Jun 30 08:15:28 UTC 2024 - Dirk Müller <dmuel...@suse.com> + +- update to 2.18: + * bugs fix (thanks xujing) + +------------------------------------------------------------------- Old: ---- rpmrebuild-2.17.tar.gz New: ---- rpmrebuild-2.18.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmrebuild.spec ++++++ --- /var/tmp/diff_new_pack.UccVzj/_old 2024-07-01 11:21:46.298123428 +0200 +++ /var/tmp/diff_new_pack.UccVzj/_new 2024-07-01 11:21:46.302123574 +0200 @@ -1,7 +1,7 @@ # # spec file for package rpmrebuild # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: rpmrebuild -Version: 2.17 +Version: 2.18 Release: 0 Summary: A tool to build a rpm file from the rpm database License: GPL-2.0-or-later @@ -35,10 +35,10 @@ BuildArch: noarch %description -rpmrebuild allows to build an rpm file from an installed rpm, or from -another rpm file, with or without changes (batch or interactive). It -can be extended by a plugin system. A typical use is to easy repackage -a software after some configuration's change. +rpmrebuild allows to build an rpm file from an installed rpm, or from another +rpm file, with or without changes (batch or interactive). It can be extended by +a plugin system. A typical use is to easy repackage a software after some +configuration's change. %prep %setup -q -c ++++++ rpmrebuild-2.17.tar.gz -> rpmrebuild-2.18.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Changelog new/Changelog --- old/Changelog 2023-01-11 10:33:52.000000000 +0100 +++ new/Changelog 2023-02-03 10:54:29.000000000 +0100 @@ -1,3 +1,8 @@ +* Sun Feb 05 2023 <eric.gerb...@tutanota.com> 2.18 +- fix --cap-from-fs is not as expected when use libcap-2.32 (xujing) +- reset %defattr when users want to keep files permission, uid and gid (xujing) +- fix -k may not keep uid or gid (xujing) + * Tue Jan 10 2023 <eric.gerb...@tutanota.com> 2.17 - fix -r does not work (xujing) - fix spelling errors that could mislead users (xujing) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/News new/News --- old/News 2023-01-10 15:34:27.000000000 +0100 +++ new/News 2023-02-03 10:54:29.000000000 +0100 @@ -1,3 +1,4 @@ +* 2023-02-05 : release 2.18, bugs fix (thanks xujing) * 2023-01-10 : release 2.17, bugs fix, args and plugin tests, new plugin exclude_file * 2021-01-17 : release 2.16, bugs fix (args, filesystem, multi-install) * 2020-02-21 : release 2.15, bugs fix, better diagnostics on errors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Todo new/Todo --- old/Todo 2022-12-29 13:10:30.000000000 +0100 +++ new/Todo 2023-01-11 13:58:53.000000000 +0100 @@ -8,4 +8,16 @@ (detect passed signature with SIGGPG, ask for new one .) -------------------------------------------------------- -fix shell syntax with http://www.shellcheck.net/ +fix shell syntax with http://www.shellcheck.net/ on plugins + +plugin un_prelink : add test of prelink bin + +ref : https://tldp.org/LDP/abs/html/string-manipulation.html +remove sed in plugins (set_tag unset_tag) + +remove sed in rpmrebuild code (use bash subsitution) + +clean man pages + sed -i -e 's/ $//' + blank ligne between section SH + same also diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Version new/Version --- old/Version 2023-01-10 15:31:43.000000000 +0100 +++ new/Version 2023-02-03 10:54:29.000000000 +0100 @@ -1 +1 @@ -2.17 +2.18 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/processing_func.src new/processing_func.src --- old/processing_func.src 2023-01-11 11:31:30.000000000 +0100 +++ new/processing_func.src 2023-02-04 10:21:12.000000000 +0100 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2004 by Valery Reznic # This file is a part of the rpmrebuild project -# $Id: rpmrebuild-2.17 | processing_func.src | Mon Jan 9 16:30:26 2023 +0100 | Eric Gerbier $ +# $Id: 2.18 | processing_func.src | Mon Jan 9 16:30:26 2023 +0100 | Eric Gerbier $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild new/rpmrebuild --- old/rpmrebuild 2023-01-11 11:31:30.000000000 +0100 +++ new/rpmrebuild 2023-02-04 10:21:12.000000000 +0100 @@ -4,7 +4,7 @@ # # Copyright (C) 2002 by Eric Gerbier # Bug reports to: eric.gerb...@tutanota.com -# $Id: rpmrebuild-2.17 | rpmrebuild | Tue Dec 20 15:32:19 2022 +0100 | Eric Gerbier $ +# $Id: 2.18 | rpmrebuild | Tue Dec 20 15:32:19 2022 +0100 | Eric Gerbier $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.lsm new/rpmrebuild.lsm --- old/rpmrebuild.lsm 2023-01-10 15:32:35.000000000 +0100 +++ new/rpmrebuild.lsm 2023-02-03 10:54:29.000000000 +0100 @@ -1,7 +1,7 @@ Begin4 Title: rpmrebuild -Version: 2.17 -Entered-date: 2023-01-10 +Version: 2.18 +Entered-date: 2023-02-05 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 2023-01-11 11:31:30.000000000 +0100 +++ new/rpmrebuild.sh 2023-02-04 10:21:12.000000000 +0100 @@ -4,7 +4,7 @@ # # Copyright (C) 2002 by Eric Gerbier # Bug reports to: eric.gerb...@tutanota.com -# $Id: rpmrebuild-2.17 | rpmrebuild.sh | Tue Jan 10 11:07:01 2023 +0100 | Eric Gerbier $ +# $Id: 2.18 | rpmrebuild.sh | Tue Jan 10 11:07:01 2023 +0100 | Eric Gerbier $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild.spec new/rpmrebuild.spec --- old/rpmrebuild.spec 2023-01-11 11:31:30.000000000 +0100 +++ new/rpmrebuild.spec 2023-02-04 10:21:11.000000000 +0100 @@ -1,4 +1,4 @@ -Version: 2.17 +Version: 2.18 %define release 1 # get rpm version %define rpm_ver %( rpm -q --queryformat='%{VERSION}' rpm | cut -f 1 -d.) @@ -80,6 +80,11 @@ %files -f rpmrebuild.files %changelog +* Sun Feb 05 2023 <eric.gerb...@tutanota.com> 2.18 +- fix --cap-from-fs is not as expected when use libcap-2.32 (xujing) +- reset %defattr when users want to keep files permission, uid and gid (xujing) +- fix -k may not keep uid or gid (xujing) + * Tue Jan 10 2023 <eric.gerb...@tutanota.com> 2.17 - fix -r does not work (xujing) - fix spelling errors that could mislead users (xujing) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_buildroot.sh new/rpmrebuild_buildroot.sh --- old/rpmrebuild_buildroot.sh 2023-01-11 11:31:30.000000000 +0100 +++ new/rpmrebuild_buildroot.sh 2023-02-04 10:21:12.000000000 +0100 @@ -6,7 +6,7 @@ # Copyright (C) 2002, 2003, 2013 by Valery Reznic # Bug reports to: valery_rez...@users.sourceforge.net # or : eric.gerb...@tutanota.com -# $Id: rpmrebuild-2.17 | rpmrebuild_buildroot.sh | Thu Dec 29 10:54:24 2022 +0100 | Eric Gerbier $ +# $Id: 2.18 | rpmrebuild_buildroot.sh | Fri Feb 3 10:05:31 2023 +0100 | Eric Gerbier $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -75,6 +75,8 @@ file_perm="${file_perm#${not_perm}}" Mkdir_p "$BuildRoot/$file" || Critical "$MY_BASENAME Mkdir_p $BuildRoot/$file" chmod "$file_perm" "$BuildRoot/$file" || Critical "$MY_BASENAME chmod $file_perm $BuildRoot/$file" + chown "$file_user" "$BuildRoot/$file" || Critical "$MY_BASENAME chown $file_user $BuildRoot/$file" + chgrp "$file_group" "$BuildRoot/$file" || Critical "$MY_BASENAME chgrp $file_group $BuildRoot/$file" ;; *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_extract_tags.sh new/rpmrebuild_extract_tags.sh --- old/rpmrebuild_extract_tags.sh 2023-01-11 11:31:30.000000000 +0100 +++ new/rpmrebuild_extract_tags.sh 2023-02-04 10:21:12.000000000 +0100 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2002 by Eric Gerbier # Bug reports to: eric.gerb...@tutanota.com -# $Id: rpmrebuild-2.17 | rpmrebuild_extract_tags.sh | Tue Dec 20 15:32:19 2022 +0100 | Eric Gerbier $ +# $Id: 2.18 | rpmrebuild_extract_tags.sh | Tue Dec 20 15:32:19 2022 +0100 | Eric Gerbier $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_files.sh new/rpmrebuild_files.sh --- old/rpmrebuild_files.sh 2023-01-11 11:31:30.000000000 +0100 +++ new/rpmrebuild_files.sh 2023-02-04 10:21:12.000000000 +0100 @@ -6,7 +6,7 @@ # Copyright (C) 2002, 2003, 2013 by Valery Reznic # Bug reports to: valery_rez...@users.sourceforge.net # or : eric.gerb...@tutanota.com -# $Id: rpmrebuild-2.17 | rpmrebuild_files.sh | Tue Dec 20 15:32:19 2022 +0100 | Eric Gerbier $ +# $Id: 2.18 | rpmrebuild_files.sh | Fri Feb 3 10:01:34 2023 +0100 | Eric Gerbier $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -69,6 +69,10 @@ fi fi +if [ "$RPMREBUILD_PUG_FROM_FS" = "yes" ]; then + echo "%defattr(-,-,-)" +fi + while :; do read file_type [ -z "$file_type" ] && break @@ -189,7 +193,10 @@ # %caps handling if [ "$RPMREBUILD_CAP_FROM_FS" = "yes" ]; then - file_cap=$( getcap "$file" | cut -f2 -d' ' ) + # several output format are possible depending libcap version + # /usr/bin/arping cap_net_raw=p + # /usr/bin/ping = cap_net_admin,cap_net_raw+p + file_cap=$( getcap "$file" | rev | cut -f1 -d' ' | rev ) else # get capability from rpm query [ "$file_cap" = "(none)" ] && file_cap="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_ghost.sh new/rpmrebuild_ghost.sh --- old/rpmrebuild_ghost.sh 2023-01-11 11:31:30.000000000 +0100 +++ new/rpmrebuild_ghost.sh 2023-02-04 10:21:12.000000000 +0100 @@ -6,7 +6,7 @@ # Copyright (C) 2002, 2003, 2013 by Valery Reznic # Bug reports to: valery_rez...@users.sourceforge.net # or : eric.gerb...@tutanota.com -# $Id: rpmrebuild-2.17 | rpmrebuild_ghost.sh | Tue Dec 20 15:32:19 2022 +0100 | Eric Gerbier $ +# $Id: 2.18 | rpmrebuild_ghost.sh | Tue Dec 20 15:32:19 2022 +0100 | Eric Gerbier $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_lib.src new/rpmrebuild_lib.src --- old/rpmrebuild_lib.src 2023-01-11 11:31:30.000000000 +0100 +++ new/rpmrebuild_lib.src 2023-02-04 10:21:12.000000000 +0100 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2011 by Eric Gerbier # This file is a part of the rpmrebuild project -# $Id: rpmrebuild-2.17 | rpmrebuild_lib.src | Mon Jan 9 15:05:49 2023 +0100 | Eric Gerbier $ +# $Id: 2.18 | rpmrebuild_lib.src | Mon Jan 9 15:05:49 2023 +0100 | Eric Gerbier $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_parser.src new/rpmrebuild_parser.src --- old/rpmrebuild_parser.src 2023-01-11 11:31:30.000000000 +0100 +++ new/rpmrebuild_parser.src 2023-02-04 10:21:12.000000000 +0100 @@ -4,7 +4,7 @@ # # Copyright (C) 2002 by Eric Gerbier # Bug reports to: eric.gerb...@tutanota.com -# $Id: rpmrebuild-2.17 | rpmrebuild_parser.src | Tue Jan 10 11:07:01 2023 +0100 | Eric Gerbier $ +# $Id: 2.18 | rpmrebuild_parser.src | Tue Jan 10 11:07:01 2023 +0100 | Eric Gerbier $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmrebuild_rpmqf.src new/rpmrebuild_rpmqf.src --- old/rpmrebuild_rpmqf.src 2023-01-11 11:31:30.000000000 +0100 +++ new/rpmrebuild_rpmqf.src 2023-02-04 10:21:12.000000000 +0100 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2002 by Eric Gerbier # Bug reports to: eric.gerb...@tutanota.com -# $Id: rpmrebuild-2.17 | rpmrebuild_rpmqf.src | Tue Dec 20 15:32:19 2022 +0100 | Eric Gerbier $ +# $Id: 2.18 | rpmrebuild_rpmqf.src | Tue Dec 20 15:32:19 2022 +0100 | Eric Gerbier $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec_func.src new/spec_func.src --- old/spec_func.src 2023-01-11 11:31:30.000000000 +0100 +++ new/spec_func.src 2023-02-04 10:21:12.000000000 +0100 @@ -2,7 +2,7 @@ ############################################################################### # Copyright (C) 2004, 2009 by Valery Reznic # This file is a part of the rpmrebuild project -# $Id: rpmrebuild-2.17 | spec_func.src | Tue Jan 10 11:07:01 2023 +0100 | Eric Gerbier $ +# $Id: 2.18 | spec_func.src | Tue Jan 10 11:07:01 2023 +0100 | Eric Gerbier $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by
