fedora-rpmdevtools rpminfo, NONE, 1.3.2.1 .cvsignore, 1.4.2.1, 1.4.2.2 COPYING, 1.4, 1.4.2.1 rpmdev-diff, 1.1, 1.1.2.1 rpmdev-extract, 1.1, 1.1.2.1 rpmdev-newspec, 1.4, 1.4.2.1 rpmdev-rmdevelrpms, 1.2.2.2, 1.2.2.3 rpmdev-vercmp, 1.1.2.2, 1.1.2.3 rpmdev-wipetree, 1.1, 1.1.2.1 rpmdevtools.spec, 1.19.2.4, 1.19.2.5 rpmls, 1.1.2.1, 1.1.2.2 template.init, 1.3.2.1, 1.3.2.2
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Wed Sep 5 21:55:26 UTC 2007
- Previous message (by thread): rpms/libnjb/devel .cvsignore, 1.6, 1.7 libnjb.rules, 1.2, 1.3 libnjb.spec, 1.9, 1.10 sources, 1.6, 1.7
- Next message (by thread): rpms/gkrellm-volume/EL-5 gkrellm-volume.spec,1.9,1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27539
Modified Files:
Tag: rpmdevtools-5
.cvsignore COPYING rpmdev-diff rpmdev-extract rpmdev-newspec
rpmdev-rmdevelrpms rpmdev-vercmp rpmdev-wipetree
rpmdevtools.spec rpmls template.init
Added Files:
Tag: rpmdevtools-5
rpminfo
Log Message:
Sync applicable bits from 6.x/HEAD.
--- NEW FILE rpminfo ---
#!/bin/sh
#
# Prints information for executables and libraries
#
# Copyright (C) 2004,2007 Red Hat, Inc.
# Authors:
# Thomas Woerner <twoerner at redhat.com>
#
# 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.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# version 2004-07-07-02
LANG=C
READELF=/usr/bin/readelf
EU_READELF=/usr/bin/eu-readelf
OBJDUMP=/usr/bin/objdump
TMPDIR=/tmp
progname=`basename $0`
usage() {
cat <<EOF
Usage: $progname [-h] [-v] [-q] [-c] [-e | -l] [-p | -np | -P | -nP | -r]
[-s] [-o <file>] {-i | [<rpm package>...]}
-h | --help print help
-v | --verbose be more verbose (to stderr)
-q | --quiet only list files
-qq really quiet: do not print rpath in split mode
-i | --installed all installed packages
-e | --executables list executables
-l | --libraries list libraries
-p | --pic list pic
-np | --no_pic list no pic
-P | --pie list pie
-nP | --no_pie list no pie
-r | --rpath list files containing rpath
-ro | --rpath_odd list files containing odd rpath
-s | --split split output (.pie, .pic, .dso_pic, .rpath..)
output must be specified
-t | --test test for odd rpath
-o <file> | --output=<file> output in file <file>
-T <dir> | --tmp-dir=<dir> temporary directory
Default options: -e -l -p -np -P -nP -r -t
EOF
exit -1
}
opt() {
[ -z "$1" ] && return
if [ -n "$opts" ]; then
[ $split -eq 0 ] && opts="${opts}, " || opts="${opts},"
fi
opts="${opts}$1"
}
check_rpath() {
[ $rpath -ne 1 ] && return
local path=`$OBJDUMP -p "$1" 2>/dev/null | grep RPATH `
if [ -n "$path" ]; then
path=`echo $path | awk '{print $2}'`
## check rpath elements
local odd=0
if [ $test -eq 1 ]; then
[ -z "$path" ] && odd=1
OLDIFS=$IFS
IFS=:
for dir in $path; do
[ -z "$dir" ] && odd=1
[ "$dir" = "." ] && odd=2
[ "$dir" = "/lib" ] && odd=3
[ "$dir" = "/lib64" ] && odd=4
[ "$dir" = "/usr/lib" ] && odd=5
[ "$dir" = "/usr/lib64" ] && odd=6
[ "$dir" = "/usr/X11R6/lib" ] && odd=7
[ "$dir" = "/usr/X11R6/lib64" ] && odd=8
[ "${dir:0:10}" = "/usr/local" ] && odd=9
[ "${dir:0:12}" = "/usr/lib/qt-" ] && odd=10
[ "${dir:0:8}" = "/usr/src" ] && odd=11
echo $dir | egrep -q "/\." && odd=12
done
IFS=$OLDIFS
fi
[ $odd -eq 0 ] && opt "RPATH $path" || opt "-RPATH $path"
fi
}
check_file() {
local file=$1
[ -L "$file" ] && return
[ ! -f "$file" ] && return
file -b "$file" 2>/dev/null | grep -q ELF || return
if $EU_READELF -h "$file" 2>/dev/null | egrep -q 'Type:[[:space:]]*EXEC';
then
if [ $exec -eq 1 ]; then
if $READELF -d "$file" 2>/dev/null | grep -q TEXTREL; then
if [ -u "$file" ]; then
[ $no_pie -eq 1 ] && opt "!PIE"
else
[ $no_pic -eq 1 ] && opt "!PIC"
fi
else
# suid
if [ -u "$file" ]; then
[ $no_pie -eq 1 ] && opt "!PIE"
else
[ $pic -eq 1 ] && opt "PIC"
fi
fi
check_rpath "$file"
fi
else
if $EU_READELF -d "$file" 2>/dev/null | egrep -q ' DEBUG[[:space:]]*$';
then
if [ $exec -eq 1 ]; then
[ $pie -eq 1 ] && opt "PIE"
check_rpath "$file"
fi
else
if [ $lib -eq 1 ]; then
if $READELF -d "$file" 2>/dev/null | grep -q TEXTREL; then
[ $no_pic -eq 1 ] && opt "DSO !PIC"
else
[ $pic -eq 1 ] && opt "DSO PIC"
fi
check_rpath "$file"
fi
fi
fi
}
check_package() {
package=$1
local pkg=
local prefix=
local files=`rpm -ql $package 2>/dev/null`
if echo $files | grep -q "not installed"; then
# not installed
if [ -f $package ]; then
rpm -qp $package >& /dev/null
if [ $? -eq 1 ]; then
# no rpm package
package=
else
prefix=$temp_prefix`basename $package`
if [ ${package:0:1} != "/" ]; then
package=`pwd`"/"$package
fi
local error=0
mkdir $prefix 2> /dev/null && pushd "$prefix" >& /dev/null
if [ $? -eq 0 ]; then
rpm2cpio "$package" \
| cpio -i --make-directories >& /dev/null
[ $? -eq 0 ] || echo "Error while extracting package '$package'.. ignoring!" > /dev/stderr
files=`rpm -qlp $package 2>/dev/null`
popd >& /dev/null
chmod -R u+rwx $prefix 2>/dev/null
else
error=1
fi
if [ $error -eq 1 ]; then
echo "Can not create package directory.. skipping package '$package'!" > /dev/stderr
return
fi
fi
else
# not a file
package=
fi
fi
if [ -z "$package" ]; then
echo "'$1' is not installed and is no rpm package.. skipping!" > /dev/stderr
return
fi
local in_pie=0
local in_non_pie=0
local in_pic=0
local in_dso_pic=0
local in_non_pic=0
local in_dso_non_pic=0
local in_rpath=0
local in_rpath_odd=0
for file in $files; do
opts=
check_file "$prefix$file"
[ -z "$opts" ] && continue
if [ $split -eq 1 ]; then
pkg=`basename $package`
OLDIFS=$IFS
IFS=,
for opt in $opts; do
o=
[ "$opt" = "PIE" ] && o=pie
[ "$opt" = "!PIE" ] && o=non_pie
[ "$opt" = "PIC" ] && o=pic
[ "$opt" = "DSO PIC" ] && o=dso_pic
[ "$opt" = "!PIC" ] && o=non_pic
[ "$opt" = "DSO !PIC" ] && o=dso_non_pic
[ "${opt:0:6}" = "RPATH " ] && o=rpath && opt=${opt:6}
[ "${opt:0:7}" = "-RPATH " ] && o=rpath_odd && opt=${opt:7}
if [ -n "$o" ]; then
eval local in=\${in_$o}
if [ $in -eq 0 ]; then
echo -e "\n$pkg" >> $output.$o
eval in_$o=1
fi
if [ "${o:0:5}" = "rpath" -a $quiet -lt 2 ]; then
echo -e "\t$file\tRPATH $opt" >> $output.$o
else
echo -e "\t$file" >> $output.$o
fi
fi
done
IFS=$OLDIFS
else
if [ -z "$pkg" ]; then
pkg=`basename $package`
echo -e "\n$pkg" >> $output
fi
if [ $quiet -eq 0 ]; then
echo -e "\t$file\t$opts" >> $output
else
echo -e "\t$file" >> $output
fi
fi
done
if [ -n "$prefix" ]; then
rm -rf $prefix
fi
}
verbose=0
quiet=0
installed=0
exec=0
lib=0
pic=0
no_pic=0
pie=0
no_pie=0
rpath=0
split=0
test=0
output=
packages=
while [ $OPTIND -le $# ]; do
eval pkg=\${$OPTIND}
if [ ${pkg:0:1} = "-" ]; then
[ "$pkg" = "-h" -o "$pkg" = "--help" ] && usage
[ "$pkg" = "-v" -o "$pkg" = "--verbose" ] && verbose=1
[ "$pkg" = "-q" -o "$pkg" = "--quiet" ] && quiet=1
[ "$pkg" = "-qq" ] && quiet=2
[ "$pkg" = "-i" -o "$pkg" = "--installed" ] && installed=1
[ "$pkg" = "-e" -o "$pkg" = "--executables" ] && exec=1
[ "$pkg" = "-l" -o "$pkg" = "--libraries" ] && lib=1
[ "$pkg" = "-p" -o "$pkg" = "--pic" ] && pic=1
[ "$pkg" = "-np" -o "$pkg" = "--no_pic" ] && no_pic=1
[ "$pkg" = "-P" -o "$pkg" = "--pie" ] && pie=1
[ "$pkg" = "-nP" -o "$pkg" = "--no_pie" ] && no_pie=1
[ "$pkg" = "-r" -o "$pkg" = "--rpath" ] && rpath=1
[ "$pkg" = "-s" -o "$pkg" = "--split" ] && split=1
[ "$pkg" = "-t" -o "$pkg" = "--test" ] && test=1
if [ "$pkg" = "-o" ]; then
OPTIND=$((OPTIND+1))
eval output=\${$OPTIND}
fi
if [ "${pkg:0:9}" = "--output=" ]; then
output=${pkg:9};
fi
if [ "$pkg" = "-T" ]; then
OPTIND=$((OPTIND+1))
eval TMPDIR=\${$OPTIND}
fi
if [ "${pkg:0:10}" = "--tmp-dir=" ]; then
TMPDIR=${pkg:10};
fi
else
packages="$packages $pkg"
fi
OPTIND=$((OPTIND+1))
done
if [ ! -x "$READELF" ]; then
echo "$progname: '$READELF' does not exist or is not executable.. exiting!"
exit -1
fi
if [ ! -x "$EU_READELF" ]; then
echo "$progname: '$EU_READELF' does not exist or is not executable.. exiting!"
exit -1
fi
if [ ! -x "$OBJDUMP" ]; then
echo "$progname: '$OBJDUMP' does not exist or is not executable.. exiting!"
exit -1
fi
if [ ! -d "$TMPDIR" -o ! -w "$TMPDIR" ]; then
echo "$progname: '$TMPDIR' does not exist or is not writable.. exiting!"
exit -1
fi
[ -z "$packages" -a $installed -eq 0 ] && usage
if [ $exec -eq 0 -a $lib -eq 0 ]; then
exec=1; lib=1
fi
if [ $pic -eq 0 -a $no_pic -eq 0 -a $pie -eq 0 -a $no_pie -eq 0 -a $rpath -eq 0 ]; then
pic=1; no_pic=1; pie=1; no_pie=1; rpath=1; test=1
fi
if [ $split -eq 1 ]; then
if [ -z "$output" ]; then
echo "You can not use split without an output file prefix.. exiting!"
exit -1
else
rm -f $output.*
fi
fi
[ -n "$output" ] && rm -f $output || output=/dev/stdout
temp_prefix=`mktemp -d -q $TMPDIR/$progname.XXXXXX`
if [ $? -ne 0 -o -z $temp_prefix ]; then
echo "Could not create temporary directory.. exiting!" > /dev/stderr
exit -1
fi
temp_prefix="$temp_prefix/"
trap "chmod -R u+rwx $temp_prefix 2>/dev/null; rm -rf $temp_prefix; exit -1" 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
pkg_num=0
for pkg in $packages; do
pkg_num=$((pkg_num+1))
done
pkg_no=1
for pkg in $packages; do
tmp=`rpm -q $pkg | sort -u 2>/dev/null`
[ $verbose -eq 1 ] && \
printf "(%*d/%d) => %s\n" ${#pkg_num} $pkg_no $pkg_num $pkg \
> /dev/stderr
if echo $tmp | grep -q "not installed"; then
check_package $pkg
else
for package in $tmp; do
check_package $package
done
fi
pkg_no=$((pkg_no+1))
done
if [ $installed -eq 1 ]; then
rpmqa=`rpm -qa | sort -u`
for i in $rpmqa; do
check_package "$i"
done
fi
exit 0
Index: .cvsignore
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/.cvsignore,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- .cvsignore 5 Jul 2007 21:19:44 -0000 1.4.2.1
+++ .cvsignore 5 Sep 2007 21:55:24 -0000 1.4.2.2
@@ -9,5 +9,4 @@
configure
install-sh
missing
-rpminfo
spectool-*
Index: COPYING
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/COPYING,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- COPYING 18 Aug 2005 05:49:16 -0000 1.4
+++ COPYING 5 Sep 2007 21:55:24 -0000 1.4.2.1
@@ -1,8 +1,8 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -15,7 +15,7 @@
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
+
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -110,7 +110,7 @@
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
@@ -303,10 +303,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
@@ -336,5 +335,5 @@
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
Index: rpmdev-diff
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-diff,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- rpmdev-diff 20 Aug 2006 15:40:44 -0000 1.1
+++ rpmdev-diff 5 Sep 2007 21:55:24 -0000 1.1.2.1
@@ -3,6 +3,9 @@
# rpmdev-diff -- Diff contents of two archives
#
+# Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
+# Author: Ville Skyttä <scop at fedoraproject.org>
+#
# 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
@@ -11,7 +14,7 @@
# 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 Library General Public License for more details.
+# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
@@ -34,11 +37,13 @@
version()
{
cat <<EOF
-rpmdev-diff version 1.0
+rpmdev-diff version 1.1
-Copyright (c) 2004-2006 Fedora Project <http://fedoraproject.org/>.
-This program is licensed under the GNU General Public License, see the
-file COPYING included in the distribution archive.
+Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
+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.
Written by Ville Skyttä.
EOF
Index: rpmdev-extract
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-extract,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- rpmdev-extract 20 Aug 2006 15:40:44 -0000 1.1
+++ rpmdev-extract 5 Sep 2007 21:55:24 -0000 1.1.2.1
@@ -3,6 +3,9 @@
# rpmdev-extract -- Extract various archives in "tar xvf" style
#
+# Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
+# Author: Ville Skyttä <scop at fedoraproject.org>
+#
# 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
@@ -11,7 +14,7 @@
# 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 Library General Public License for more details.
+# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
@@ -27,14 +30,18 @@
force=
dir=
+shopt -s extglob
+
version()
{
cat <<EOF
-rpmdev-extract version 1.0
+rpmdev-extract version 1.1
-Copyright (c) 2004-2006 Fedora Project <http://fedoraproject.org/>.
-This program is licensed under the GNU General Public License, see the
-file COPYING included in the distribution archive.
+Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
+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.
Written by Ville Skyttä.
EOF
@@ -142,7 +149,11 @@
cabextract -f "$f"
;;
rpm)
- name=`rpm -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}" "$f"`
+ name=`rpm -qp --qf="%{NAME}-%{VERSION}-%{RELEASE}" "$f"`
+ if [ -z "$name" ] ; then # workaround for #250990
+ bname="`basename "$f"`"
+ name=${bname/?(\.*([^\.]))\.rpm/}
+ fi
mkdir -p "$name"
cd "$name"
rpm2cpio "$f" \
Index: rpmdev-newspec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-newspec,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- rpmdev-newspec 9 Sep 2006 17:04:18 -0000 1.4
+++ rpmdev-newspec 5 Sep 2007 21:55:24 -0000 1.4.2.1
@@ -1,5 +1,24 @@
#!/bin/bash
+# rpmdev-newspec -- generate new rpm .spec file from template
+#
+# Copyright (c) Warren Togami <warren at togami.com>,
+# Ville Skyttä <scop at fedoraproject.org>
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
SPECDIR="/etc/rpmdevtools"
DEFTYPE="minimal"
DEFSPEC="newpackage.spec"
Index: rpmdev-rmdevelrpms
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-rmdevelrpms,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- rpmdev-rmdevelrpms 7 Jul 2007 08:55:42 -0000 1.2.2.2
+++ rpmdev-rmdevelrpms 5 Sep 2007 21:55:24 -0000 1.2.2.3
@@ -3,7 +3,8 @@
# rpmdev-rmdevelrpms -- Find (and optionally remove) "development" RPMs
#
-# Author: Ville Skyttä <ville.skytta at iki.fi>
+# Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
+# Author: Ville Skyttä <scop at fedoraproject.org>
# Credits: Seth Vidal (yum), Thomas Vander Stichele (mach)
#
# This program is free software; you can redistribute it and/or modify
@@ -14,7 +15,7 @@
# 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 Library General Public License for more details.
+# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
@@ -24,7 +25,7 @@
import getopt, os, re, rpm, stat, sys, types
-__version__ = "1.7"
+__version__ = "1.8"
dev_re = re.compile("-(?:de(?:buginfo|vel)|sdk|static)\\b", re.IGNORECASE)
@@ -154,8 +155,10 @@
print "rpmdev-rmdevelrpms version %s" % __version__
print '''
Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
-This program is licensed under the GNU General Public License, see the
-file COPYING included in the distribution archive.
+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.
Written by Ville Skyttä.'''
sys.exit(0)
Index: rpmdev-vercmp
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-vercmp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- rpmdev-vercmp 7 Jul 2007 08:47:26 -0000 1.1.2.2
+++ rpmdev-vercmp 5 Sep 2007 21:55:24 -0000 1.1.2.3
@@ -1,6 +1,22 @@
#!/usr/bin/python
#
-# Seth Vidal - yadda yadda yadda GPL Yadda yadda yadda Use at own risk
+# rpmdev-vercmp -- compare rpm versions
+#
+# Copyright (c) Seth Vidal
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import rpm
import sys
Index: rpmdev-wipetree
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-wipetree,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- rpmdev-wipetree 20 Aug 2006 15:40:44 -0000 1.1
+++ rpmdev-wipetree 5 Sep 2007 21:55:24 -0000 1.1.2.1
@@ -1,10 +1,23 @@
#!/bin/sh
#
-# rpmdev-wipetree
-# Erases all files within the rpm build dir
+# rpmdev-wipetree -- erase all files within the rpm build dir
#
-# Author: Warren Togami <warren at togami.com>
-# License: GPL
+# Copyright (c) Warren Togami <warren at togami.com>,
+# Ville Skyttä <scop at fedoraproject.org>
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Sanity Check: Forbid root user
if [ $(id -u) -eq 0 ]; then
Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.5
diff -u -r1.19.2.4 -r1.19.2.5
--- rpmdevtools.spec 7 Jul 2007 10:34:04 -0000 1.19.2.4
+++ rpmdevtools.spec 5 Sep 2007 21:55:24 -0000 1.19.2.5
@@ -8,7 +8,8 @@
Summary: RPM Development Tools
Group: Development/Tools
-License: GPL
+# rpmdev-setuptree is GPLv2, everything else GPLv2+
+License: GPLv2+ and GPLv2
URL: http://fedoraproject.org/
Source0: %{name}-%{version}.tar.bz2
Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
@@ -135,6 +136,13 @@
%changelog
+* Thu Sep 6 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Init script template cleanups.
+- Update rpminfo to version 2004-07-07-02.
+- Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+- Work around #250990 in rpmls and rpmdev-extract.
+- Clarify copyright info of rpmdev-* and rpmls.
+
* Sat Jul 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 5.4-1
- Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2.
- The long form of the list option in rmdevelrpms is --list-only, not --list.
Index: rpmls
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmls,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- rpmls 5 Jul 2007 21:19:44 -0000 1.1.2.1
+++ rpmls 5 Sep 2007 21:55:24 -0000 1.1.2.2
@@ -10,12 +10,14 @@
# 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 Library General Public License for more details.
+# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+unset CDPATH
+
owner=
if [ "$1" = "-l" ] ; then
owner='%-8{fileusername} %-8{filegroupname} '
@@ -23,8 +25,15 @@
fi
qf="[%-11{filemodes:perms} $owner%{filenames}\\n]"
-for file in "$@" ; do
- p=
- case "$file" in *.[rs]pm) p=p ;; esac
- rpm -q$p --qf="$qf" "$file"
+for arg in "$@" ; do
+ case "$arg" in
+ *.[rs]pm)
+ # dirname/basename: workaround for #250990
+ cd "$(dirname "$arg")"
+ rpm -qp --qf="$qf" "$(basename "$arg")"
+ cd - >/dev/null 2>&1
+ ;;
+ *)
+ rpm -q --qf="$qf" "$arg"
+ esac
done
Index: template.init
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/template.init,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- template.init 5 Jul 2007 21:19:44 -0000 1.3.2.1
+++ template.init 5 Sep 2007 21:55:24 -0000 1.3.2.2
@@ -26,12 +26,6 @@
# Source function library.
. /etc/rc.d/init.d/functions
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ "$NETWORKING" = "no" ] && exit 0
-
exec="/path/to/<daemonname>"
prog=$(basename $exec)
@@ -62,32 +56,27 @@
start
}
-reload() {
- restart
-}
-
-force_reload() {
- restart
-}
-
-fdr_status() {
- status $prog
-}
-
case "$1" in
start|stop|restart|reload)
$1
;;
force-reload)
- force_reload
+ restart
;;
status)
- fdr_status
+ status $prog
;;
- condrestart|try-restart)
- [ ! -f $lockfile ] || restart
+ try-restart|condrestart)
+ if status $prog >/dev/null ; then
+ restart
+ fi
;;
+ reload)
+ # If config can be reloaded without restarting, implement it here,
+ # remove the "exit", and add "reload" to the usage message below.
+ action $"Service $prog does not support the reload action: " /bin/false
+ exit 3
*)
- echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+ echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
exit 2
esac
- Previous message (by thread): rpms/libnjb/devel .cvsignore, 1.6, 1.7 libnjb.rules, 1.2, 1.3 libnjb.spec, 1.9, 1.10 sources, 1.6, 1.7
- Next message (by thread): rpms/gkrellm-volume/EL-5 gkrellm-volume.spec,1.9,1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list