|
[-]
[+]
|
Changed |
rpmrebuild-2.10.tar.bz2/Changelog
|
| @@ -1,3 +1,6 @@
+* Sun Aug 11 2013 <gerbier@users.sourceforge.net> 2.10-2
+- bugfix from 2.10 on test install : test was inverted (applied on rpm files instead installed rpm)
+
* Tue Aug 01 2013 <valery_reznic@users.sourceforge.net> 2.10
- add tag DISTTAG (feature request)
- do not test install if work on rpm files
|
|
[-]
[+]
|
Changed |
rpmrebuild-2.10.tar.bz2/Release
^
|
| @@ -1 +1 @@
-1
+2
|
|
[-]
[+]
|
Changed |
rpmrebuild-2.10.tar.bz2/rpmrebuild.sh
^
|
| @@ -4,7 +4,7 @@
#
# Copyright (C) 2002 by Eric Gerbier
# Bug reports to: gerbier@users.sourceforge.net
-# $Id: rpmrebuild.sh 834 2013-08-01 11:40:20Z gerbier $
+# $Id: rpmrebuild.sh 844 2013-08-09 09:13: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
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
#
###############################################################################
-VERSION="$Id: rpmrebuild.sh 834 2013-08-01 11:40:20Z gerbier $"
+VERSION="$Id: rpmrebuild.sh 844 2013-08-09 09:13:34Z gerbier $"
# debug
#set -x
@@ -215,17 +215,17 @@
function InstallationTest
{
if [ "x$package_flag" = "x" ]; then
- # do not test install if work on rpm files
- return 0;
- else
# installation test
# force is necessary to avoid the message : already installed
rpm -U --test --force ${RPMFILENAME} || {
- Error "package '${PAQUET}' $TestFailed"
- return 1
- }
- return 0
-fi
+ Error "package '${PAQUET}' $TestFailed"
+ return 1
+ }
+ return 0
+ else
+ # do not test install if work on rpm files
+ return 0;
+ fi
}
###############################################################################
# execute all pre-computed operations on spec files
|
|
[-]
[+]
|
Changed |
rpmrebuild-2.10.tar.bz2/rpmrebuild.spec
^
|
| @@ -1,5 +1,5 @@
Version: 2.10
-%define release 1
+%define release 2
# get rpm version
%define rpm_ver %( rpm -q --queryformat='%{VERSION}' rpm | cut -f 1 -d.)
# test for an rpm version
@@ -75,6 +75,9 @@
%files -f rpmrebuild.files
%changelog
+* Sun Aug 11 2013 <gerbier@users.sourceforge.net> 2.10-2
+- bugfix from 2.10 on test install : test was inverted (applied on rpm files instead installed rpm)
+
* Tue Aug 01 2013 <valery_reznic@users.sourceforge.net> 2.10
- add tag DISTTAG (feature request)
- do not test install if work on rpm files
|
