rpms/rpm/devel rpm.spec,1.222,1.223

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Mar 2 13:42:01 UTC 2007


Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24143

Modified Files:
	rpm.spec 
Log Message:
Clean ups for merge



Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- rpm.spec	19 Feb 2007 17:00:41 -0000	1.222
+++ rpm.spec	2 Mar 2007 13:41:59 -0000	1.223
@@ -1,28 +1,28 @@
-%define	with_python_subpackage	1%{nil}
-%define	with_python_version	2.5%{nil}
-%define	with_bzip2		1%{nil}
-%define	with_apidocs		1%{nil}
+%define with_python_subpackage  1%{nil}
+%define with_python_version     2.5%{nil}
+%define with_apidocs            1%{nil}
 
 # XXX legacy requires './' payload prefix to be omitted from rpm packages.
-%define	_noPayloadPrefix	1
+%define _noPayloadPrefix        1
 
-%define	__prefix	%{?_prefix}%{!?_prefix:/usr}
+%define __prefix        %{?_prefix}%{!?_prefix:/usr}
 %{?!_lib: %define _lib lib}
 %{expand: %%define __share %(if [ -d %{__prefix}/share/man ]; then echo /share ; else echo %%{nil} ; fi)}
 
-%define __bindir	%{__prefix}/bin
-%define __includedir	%{__prefix}/include
-%define __libdir	%{__prefix}/%{_lib}
-%define __mandir	%{__prefix}%{__share}/man
+%define __bindir        %{__prefix}/bin
+%define __includedir    %{__prefix}/include
+%define __libdir        %{__prefix}/%{_lib}
+%define __mandir        %{__prefix}%{__share}/man
 
-Summary: The RPM package management system.
+Summary: The RPM package management system
 Name: rpm
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
 Release: 40%{?dist}
 Group: System Environment/Base
-Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
+Url: http://www.rpm.org/
+Source: rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
 Source2: mono-find-requires
 Patch0: rpm-4.4.1-hkp-disable.patch
@@ -63,18 +63,16 @@
 Patch35: rpm-4.4.2-query-flushbuffer.patch
 Patch36: rpm-4.4.2-unicodekey.patch
 License: GPL
-Conflicts: patch < 2.5
-%ifos linux
-Prereq: fileutils shadow-utils
-%endif
+Requires: patch > 2.5
+Prereq: shadow-utils
 Requires: popt = 1.10.2
-Obsoletes: rpm-perl < %{version}
+Requires: crontab
 
 BuildRequires: autoconf
 BuildRequires: elfutils-devel >= 0.112
 BuildRequires: elfutils-libelf-devel-static
 
-BuildRequires: sed readline-devel zlib-devel
+BuildRequires: readline-devel zlib-devel
 
 BuildRequires: beecrypt-devel >= 4.1.2
 Requires: beecrypt >= 4.1.2
@@ -83,13 +81,9 @@
 BuildRequires: sqlite-devel
 BuildRequires: gettext-devel
 BuildRequires: libselinux-devel
-#XXX: lua fix this
 BuildRequires: ncurses-devel
-
-# XXX Red Hat 5.2 has not bzip2 or python
-%if %{with_bzip2}
 BuildRequires: bzip2-devel >= 0.9.0c-2
-%endif
+
 %if %{with_python_subpackage}
 BuildRequires: python-devel >= %{with_python_version}
 %endif
@@ -104,7 +98,7 @@
 the package like its version, a description, etc.
 
 %package libs
-Summary:  Libraries for manipulating RPM packages.
+Summary:  Libraries for manipulating RPM packages
 Group: Development/Libraries
 Requires: rpm = %{rpm_version}-%{release}
 
@@ -112,7 +106,7 @@
 This package contains the RPM shared libraries.
 
 %package devel
-Summary:  Development files for manipulating RPM packages.
+Summary:  Development files for manipulating RPM packages
 Group: Development/Libraries
 Requires: rpm = %{rpm_version}-%{release}
 Requires: beecrypt >= 4.1.2
@@ -133,7 +127,7 @@
 will manipulate RPM packages and databases.
 
 %package build
-Summary: Scripts and executable programs used to build packages.
+Summary: Scripts and executable programs used to build packages
 Group: Development/Tools
 Requires: rpm = %{rpm_version}-%{release}, patch >= 2.5, file, elfutils
 Requires: findutils
@@ -145,10 +139,9 @@
 
 %if %{with_python_subpackage}
 %package python
-Summary: Python bindings for apps which will manipulate RPM packages.
+Summary: Python bindings for apps which will manipulate RPM packages
 Group: Development/Libraries
 Requires: rpm = %{rpm_version}-%{release}
-Requires: python >= %{with_python_version}
 
 %description python
 The rpm-python package contains a module that permits applications
@@ -160,7 +153,7 @@
 %endif
 
 %package -n popt
-Summary: A C library for parsing command line parameters.
+Summary: A C library for parsing command line parameters
 Group: Development/Libraries
 Version: 1.10.2
 
@@ -228,17 +221,8 @@
 WITH_PYTHON="--without-python"
 %endif
 
-%ifos linux
 CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
-./configure --prefix=%{__prefix} --sysconfdir=/etc \
-	--localstatedir=/var --infodir='${prefix}%{__share}/info' \
-	--mandir='${prefix}%{__share}/man' \
-	$WITH_PYTHON --enable-posixmutexes --without-javaglue
-%else
-export CPPFLAGS=-I%{__prefix}/include 
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix} $WITH_PYTHON \
-	--without-javaglue
-%endif
+%configure $WITH_PYTHON --enable-posixmutexes --without-javaglue
 
 make -C zlib || :
 
@@ -256,9 +240,9 @@
 # workaround to #132435,
 # and from linking to included zlib
 for i in librpm.la librpmbuild.la librpmdb.la librpmio.la ; do
-	sed -i -e 's~-L'"$RPM_BUILD_ROOT"'[^ ]* ~~g' \
-		-e 's~-L'"$RPM_BUILD_DIR"'[^ ]* ~~g' \
-		"$RPM_BUILD_ROOT%{__libdir}/$i"
+        sed -i -e 's~-L'"$RPM_BUILD_ROOT"'[^ ]* ~~g' \
+                -e 's~-L'"$RPM_BUILD_DIR"'[^ ]* ~~g' \
+                "$RPM_BUILD_ROOT%{__libdir}/$i"
 done
 
 # Clean up dangling symlinks
@@ -272,8 +256,6 @@
     rm -f "$RPM_BUILD_ROOT"/"$i" 
 done
 
-%ifos linux
-
 # Save list of packages through cron
 mkdir -p ${RPM_BUILD_ROOT}/etc/cron.daily
 install -m 755 scripts/rpm.daily ${RPM_BUILD_ROOT}/etc/cron.daily/rpm
@@ -286,21 +268,15 @@
 mkdir -p $RPM_BUILD_ROOT/var/spool/repackage
 mkdir -p $RPM_BUILD_ROOT/var/lib/rpm
 for dbi in \
-	Basenames Conflictname Dirnames Group Installtid Name Packages \
-	Providename Provideversion Requirename Requireversion Triggername \
-	Filemd5s Pubkeys Sha1header Sigmd5 \
-	__db.001 __db.002 __db.003 __db.004 __db.005 __db.006 __db.007 \
-	__db.008 __db.009
+        Basenames Conflictname Dirnames Group Installtid Name Packages \
+        Providename Provideversion Requirename Requireversion Triggername \
+        Filemd5s Pubkeys Sha1header Sigmd5 \
+        __db.001 __db.002 __db.003 __db.004 __db.005 __db.006 __db.007 \
+        __db.008 __db.009
 do
     touch $RPM_BUILD_ROOT/var/lib/rpm/$dbi
 done
 
-%endif
-
-%if %{with_apidocs}
-gzip -9n apidocs/man/man*/* || :
-%endif
-
 # Get rid of unpackaged files
 { cd $RPM_BUILD_ROOT
   rm -f .%{_libdir}/lib*.la
@@ -321,25 +297,21 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%ifos linux
 if [ -f /var/lib/rpm/packages.rpm ]; then
     echo "
 You have (unsupported)
-	/var/lib/rpm/packages.rpm	db1 format installed package headers
+        /var/lib/rpm/packages.rpm       db1 format installed package headers
 Please install rpm-4.0.4 first, and do
-	rpm --rebuilddb
+        rpm --rebuilddb
 to convert your database from db1 to db3 format.
 "
     exit 1
 fi
-/usr/sbin/groupadd -g 37 rpm				> /dev/null 2>&1
-/usr/sbin/useradd  -r -d /var/lib/rpm -u 37 -g 37 rpm -s /sbin/nologin	> /dev/null 2>&1
-%endif
+/usr/sbin/groupadd -g 37 rpm                            > /dev/null 2>&1
+/usr/sbin/useradd  -r -d /var/lib/rpm -u 37 -g 37 rpm -s /sbin/nologin  > /dev/null 2>&1
 exit 0
 
 %post
-%ifos linux
-
 # Establish correct rpmdb ownership.
 /bin/chown rpm.rpm /var/lib/rpm/[A-Z]*
 
@@ -349,12 +321,10 @@
 [ -w /var/lib/rpm/__db.001 ] &&
 /usr/lib/rpm/rpmdb_stat -CA -h /var/lib/rpm 2>&1 |
 grep "db_stat: Program version 4.3 doesn't match environment version" 2>&1 > /dev/null &&
-	rm -f /var/lib/rpm/__db*
+        rm -f /var/lib/rpm/__db*
                                                                                 
-%endif
 exit 0
 
-%ifos linux
 %postun
 if [ $1 = 0 ]; then
     /usr/sbin/userdel rpm
@@ -370,120 +340,112 @@
 
 %post -n popt -p /sbin/ldconfig
 %postun -n popt -p /sbin/ldconfig
-%endif
 
-%if %{with_python_subpackage}
-%post python -p /sbin/ldconfig
-%postun python -p /sbin/ldconfig
-%endif
-
-%define	rpmattr		%attr(0755, rpm, rpm)
+%define rpmattr         %attr(0755, rpm, rpm)
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc RPM-PGP-KEY RPM-GPG-KEY BETA-GPG-KEY CHANGES GROUPS doc/manual/[a-z]*
 # XXX comment these lines out if building with rpm that knows not %pubkey attr
 %pubkey RPM-PGP-KEY
 %pubkey RPM-GPG-KEY
 %pubkey BETA-GPG-KEY
-%attr(0755, rpm, rpm)	/bin/rpm
+%attr(0755, rpm, rpm)   /bin/rpm
 
-%ifos linux
-%config(noreplace,missingok)	/etc/cron.daily/rpm
-%config(noreplace,missingok)	/etc/logrotate.d/rpm
-%dir				/etc/rpm
-#%config(noreplace,missingok)	/etc/rpm/macros.*
-%attr(0755, rpm, rpm)	%dir /var/lib/rpm
-%attr(0755, rpm, rpm)	%dir /var/spool/repackage
-
-%define	rpmdbattr %attr(0644, rpm, rpm) %verify(not md5 size mtime) %ghost %config(missingok,noreplace)
-%rpmdbattr	/var/lib/rpm/*
-%endif
-
-%rpmattr	%{__bindir}/rpm2cpio
-%rpmattr	%{__bindir}/gendiff
-%rpmattr	%{__bindir}/rpmdb
-#%rpmattr	%{__bindir}/rpm[eiu]
-%rpmattr	%{__bindir}/rpmsign
-%rpmattr	%{__bindir}/rpmquery
-%rpmattr	%{__bindir}/rpmverify
-
-%attr(0755, rpm, rpm)	%dir %{__prefix}/lib/rpm
-%rpmattr	%{__prefix}/lib/rpm/config.guess
-%rpmattr	%{__prefix}/lib/rpm/config.sub
-%rpmattr	%{__prefix}/lib/rpm/convertrpmrc.sh
-%rpmattr	%{__prefix}/lib/rpm/freshen.sh
-%attr(0644, rpm, rpm)	%{__prefix}/lib/rpm/macros
-%rpmattr	%{__prefix}/lib/rpm/mkinstalldirs
-%rpmattr	%{__prefix}/lib/rpm/rpm.*
-%rpmattr	%{__prefix}/lib/rpm/rpm2cpio.sh
-%rpmattr	%{__prefix}/lib/rpm/rpm[deiukqv]
-%rpmattr	%{__prefix}/lib/rpm/tgpg
-%attr(0644, rpm, rpm)	%{__prefix}/lib/rpm/rpmpopt*
-%attr(0644, rpm, rpm)	%{__prefix}/lib/rpm/rpmrc
+/etc/cron.daily/rpm
+%config(noreplace,missingok)    /etc/logrotate.d/rpm
+%dir                            /etc/rpm
+#%config(noreplace,missingok)   /etc/rpm/macros.*
+%attr(0755, rpm, rpm)   %dir /var/lib/rpm
+%attr(0755, rpm, rpm)   %dir /var/spool/repackage
+
+%define rpmdbattr %attr(0644, rpm, rpm) %verify(not md5 size mtime) %ghost %config(missingok,noreplace)
+%rpmdbattr      /var/lib/rpm/*
+
+%rpmattr        %{__bindir}/rpm2cpio
+%rpmattr        %{__bindir}/gendiff
+%rpmattr        %{__bindir}/rpmdb
+#%rpmattr       %{__bindir}/rpm[eiu]
+%rpmattr        %{__bindir}/rpmsign
+%rpmattr        %{__bindir}/rpmquery
+%rpmattr        %{__bindir}/rpmverify
+
+%attr(0755, rpm, rpm)   %dir %{__prefix}/lib/rpm
+%rpmattr        %{__prefix}/lib/rpm/config.guess
+%rpmattr        %{__prefix}/lib/rpm/config.sub
+%rpmattr        %{__prefix}/lib/rpm/convertrpmrc.sh
+%rpmattr        %{__prefix}/lib/rpm/freshen.sh
+%attr(0644, rpm, rpm)   %{__prefix}/lib/rpm/macros
+%rpmattr        %{__prefix}/lib/rpm/mkinstalldirs
+%rpmattr        %{__prefix}/lib/rpm/rpm.*
+%rpmattr        %{__prefix}/lib/rpm/rpm2cpio.sh
+%rpmattr        %{__prefix}/lib/rpm/rpm[deiukqv]
+%rpmattr        %{__prefix}/lib/rpm/tgpg
+%attr(0644, rpm, rpm)   %{__prefix}/lib/rpm/rpmpopt*
+%attr(0644, rpm, rpm)   %{__prefix}/lib/rpm/rpmrc
 
 %ifarch i386 i486 i586 i686 athlon pentium3 pentium4
-%attr(-, rpm, rpm)		%{__prefix}/lib/rpm/i[3456]86*
-%attr(-, rpm, rpm)		%{__prefix}/lib/rpm/athlon*
-%attr(-, rpm, rpm)		%{__prefix}/lib/rpm/pentium*
+%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/i[3456]86*
+%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/athlon*
+%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/pentium*
 %endif
 %ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67
-%attr(-, rpm, rpm)		%{__prefix}/lib/rpm/alpha*
+%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/alpha*
 %endif
 %ifarch sparc sparcv8 sparcv9 sparc64
-%attr(-, rpm, rpm)		%{__prefix}/lib/rpm/sparc*
+%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/sparc*
 %endif
 %ifarch ia64
-%attr(-, rpm, rpm)		%{__prefix}/lib/rpm/ia64*
+%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/ia64*
 %endif
 %ifarch powerpc ppc ppciseries ppcpseries ppcmac ppc64
-%attr(-, rpm, rpm)		%{__prefix}/lib/rpm/ppc*
+%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/ppc*
 %endif
 %ifarch s390 s390x
-%attr(-, rpm, rpm)		%{__prefix}/lib/rpm/s390*
+%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/s390*
 %endif
 %ifarch armv3l armv4l
-%attr(-, rpm, rpm)		%{__prefix}/lib/rpm/armv[34][lb]*
+%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/armv[34][lb]*
 %endif
 %ifarch mips mipsel
-%attr(-, rpm, rpm)		%{__prefix}/lib/rpm/mips*
+%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/mips*
 %endif
 %ifarch x86_64
-%attr(-, rpm, rpm)		%{__prefix}/lib/rpm/x86_64*
+%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/x86_64*
 %endif
-%attr(-, rpm, rpm)		%{__prefix}/lib/rpm/noarch*
+%attr(-, rpm, rpm)              %{__prefix}/lib/rpm/noarch*
 
-%rpmattr	%{__prefix}/lib/rpm/rpmdb_*
-%rpmattr	%{__prefix}/lib/rpm/rpmfile
+%rpmattr        %{__prefix}/lib/rpm/rpmdb_*
+%rpmattr        %{__prefix}/lib/rpm/rpmfile
 
-%lang(cs)	%{__prefix}/*/locale/cs/LC_MESSAGES/rpm.mo
-%lang(da)	%{__prefix}/*/locale/da/LC_MESSAGES/rpm.mo
-%lang(de)	%{__prefix}/*/locale/de/LC_MESSAGES/rpm.mo
-%lang(fi)	%{__prefix}/*/locale/fi/LC_MESSAGES/rpm.mo
-%lang(fr)	%{__prefix}/*/locale/fr/LC_MESSAGES/rpm.mo
-%lang(gl)	%{__prefix}/*/locale/gl/LC_MESSAGES/rpm.mo
-%lang(is)	%{__prefix}/*/locale/is/LC_MESSAGES/rpm.mo
-%lang(ja)	%{__prefix}/*/locale/ja/LC_MESSAGES/rpm.mo
-%lang(ko)	%{__prefix}/*/locale/ko/LC_MESSAGES/rpm.mo
-%lang(no)	%{__prefix}/*/locale/no/LC_MESSAGES/rpm.mo
-%lang(pl)	%{__prefix}/*/locale/pl/LC_MESSAGES/rpm.mo
-%lang(pt)	%{__prefix}/*/locale/pt/LC_MESSAGES/rpm.mo
-%lang(pt_BR)	%{__prefix}/*/locale/pt_BR/LC_MESSAGES/rpm.mo
-%lang(ro)	%{__prefix}/*/locale/ro/LC_MESSAGES/rpm.mo
-%lang(ru)	%{__prefix}/*/locale/ru/LC_MESSAGES/rpm.mo
-%lang(sk)	%{__prefix}/*/locale/sk/LC_MESSAGES/rpm.mo
-%lang(sl)	%{__prefix}/*/locale/sl/LC_MESSAGES/rpm.mo
-%lang(sr)	%{__prefix}/*/locale/sr/LC_MESSAGES/rpm.mo
-%lang(sv)	%{__prefix}/*/locale/sv/LC_MESSAGES/rpm.mo
-%lang(tr)	%{__prefix}/*/locale/tr/LC_MESSAGES/rpm.mo
+%lang(cs)       %{__prefix}/*/locale/cs/LC_MESSAGES/rpm.mo
+%lang(da)       %{__prefix}/*/locale/da/LC_MESSAGES/rpm.mo
+%lang(de)       %{__prefix}/*/locale/de/LC_MESSAGES/rpm.mo
+%lang(fi)       %{__prefix}/*/locale/fi/LC_MESSAGES/rpm.mo
+%lang(fr)       %{__prefix}/*/locale/fr/LC_MESSAGES/rpm.mo
+%lang(gl)       %{__prefix}/*/locale/gl/LC_MESSAGES/rpm.mo
+%lang(is)       %{__prefix}/*/locale/is/LC_MESSAGES/rpm.mo
+%lang(ja)       %{__prefix}/*/locale/ja/LC_MESSAGES/rpm.mo
+%lang(ko)       %{__prefix}/*/locale/ko/LC_MESSAGES/rpm.mo
+%lang(no)       %{__prefix}/*/locale/no/LC_MESSAGES/rpm.mo
+%lang(pl)       %{__prefix}/*/locale/pl/LC_MESSAGES/rpm.mo
+%lang(pt)       %{__prefix}/*/locale/pt/LC_MESSAGES/rpm.mo
+%lang(pt_BR)    %{__prefix}/*/locale/pt_BR/LC_MESSAGES/rpm.mo
+%lang(ro)       %{__prefix}/*/locale/ro/LC_MESSAGES/rpm.mo
+%lang(ru)       %{__prefix}/*/locale/ru/LC_MESSAGES/rpm.mo
+%lang(sk)       %{__prefix}/*/locale/sk/LC_MESSAGES/rpm.mo
+%lang(sl)       %{__prefix}/*/locale/sl/LC_MESSAGES/rpm.mo
+%lang(sr)       %{__prefix}/*/locale/sr/LC_MESSAGES/rpm.mo
+%lang(sv)       %{__prefix}/*/locale/sv/LC_MESSAGES/rpm.mo
+%lang(tr)       %{__prefix}/*/locale/tr/LC_MESSAGES/rpm.mo
 
 %{__mandir}/man1/gendiff.1*
 %{__mandir}/man8/rpm.8*
 %{__mandir}/man8/rpm2cpio.8*
-%lang(ja)	%{__mandir}/ja/man[18]/*.[18]*
-%lang(pl)	%{__mandir}/pl/man[18]/*.[18]*
-%lang(ru)	%{__mandir}/ru/man[18]/*.[18]*
-%lang(sk)	%{__mandir}/sk/man[18]/*.[18]*
+%lang(ja)       %{__mandir}/ja/man[18]/*.[18]*
+%lang(pl)       %{__mandir}/pl/man[18]/*.[18]*
+%lang(ru)       %{__mandir}/ru/man[18]/*.[18]*
+%lang(sk)       %{__mandir}/sk/man[18]/*.[18]*
 
 %files libs
 %defattr(-,root,root)
@@ -501,44 +463,44 @@
 %dir %{__prefix}/src/redhat/SRPMS
 %dir %{__prefix}/src/redhat/RPMS
 %{__prefix}/src/redhat/RPMS/*
-%rpmattr	%{__bindir}/rpmbuild
-%rpmattr	%{__prefix}/lib/rpm/brp-*
-%rpmattr	%{__prefix}/lib/rpm/check-files
-%rpmattr	%{__prefix}/lib/rpm/check-prereqs
-%rpmattr	%{__prefix}/lib/rpm/config.site
-%rpmattr	%{__prefix}/lib/rpm/cross-build
-%rpmattr	%{__prefix}/lib/rpm/debugedit
-%rpmattr	%{__prefix}/lib/rpm/find-debuginfo.sh
-%rpmattr	%{__prefix}/lib/rpm/find-lang.sh
-%rpmattr	%{__prefix}/lib/rpm/find-prov.pl
-%rpmattr	%{__prefix}/lib/rpm/find-provides
-%rpmattr	%{__prefix}/lib/rpm/find-provides.perl
-%rpmattr	%{__prefix}/lib/rpm/find-req.pl
-%rpmattr	%{__prefix}/lib/rpm/find-requires
-%rpmattr	%{__prefix}/lib/rpm/find-requires.perl
-%rpmattr	%{__prefix}/lib/rpm/get_magic.pl
-%rpmattr	%{__prefix}/lib/rpm/getpo.sh
-%rpmattr	%{__prefix}/lib/rpm/http.req
-%rpmattr	%{__prefix}/lib/rpm/javadeps
-%rpmattr	%{__prefix}/lib/rpm/magic
-%rpmattr	%{__prefix}/lib/rpm/magic.mgc
-%rpmattr	%{__prefix}/lib/rpm/magic.mime
-%rpmattr	%{__prefix}/lib/rpm/magic.mime.mgc
-%rpmattr	%{__prefix}/lib/rpm/magic.prov
-%rpmattr	%{__prefix}/lib/rpm/magic.req
-%rpmattr	%{__prefix}/lib/rpm/mono-find-provides
-%rpmattr	%{__prefix}/lib/rpm/mono-find-requires
-%rpmattr	%{__prefix}/lib/rpm/perldeps.pl
-%rpmattr	%{__prefix}/lib/rpm/perl.prov
-%rpmattr	%{__prefix}/lib/rpm/perl.req
-%rpmattr	%{__prefix}/lib/rpm/pythondeps.sh
-
-%rpmattr	%{__prefix}/lib/rpm/rpm[bt]
-%rpmattr	%{__prefix}/lib/rpm/rpmdeps
-%rpmattr	%{__prefix}/lib/rpm/trpm
-%rpmattr	%{__prefix}/lib/rpm/u_pkg.sh
-%rpmattr	%{__prefix}/lib/rpm/vpkg-provides.sh
-%rpmattr	%{__prefix}/lib/rpm/vpkg-provides2.sh
+%rpmattr        %{__bindir}/rpmbuild
+%rpmattr        %{__prefix}/lib/rpm/brp-*
+%rpmattr        %{__prefix}/lib/rpm/check-files
+%rpmattr        %{__prefix}/lib/rpm/check-prereqs
+%rpmattr        %{__prefix}/lib/rpm/config.site
+%rpmattr        %{__prefix}/lib/rpm/cross-build
+%rpmattr        %{__prefix}/lib/rpm/debugedit
+%rpmattr        %{__prefix}/lib/rpm/find-debuginfo.sh
+%rpmattr        %{__prefix}/lib/rpm/find-lang.sh
+%rpmattr        %{__prefix}/lib/rpm/find-prov.pl
+%rpmattr        %{__prefix}/lib/rpm/find-provides
+%rpmattr        %{__prefix}/lib/rpm/find-provides.perl
+%rpmattr        %{__prefix}/lib/rpm/find-req.pl
+%rpmattr        %{__prefix}/lib/rpm/find-requires
+%rpmattr        %{__prefix}/lib/rpm/find-requires.perl
+%rpmattr        %{__prefix}/lib/rpm/get_magic.pl
+%rpmattr        %{__prefix}/lib/rpm/getpo.sh
+%rpmattr        %{__prefix}/lib/rpm/http.req
+%rpmattr        %{__prefix}/lib/rpm/javadeps
+%rpmattr        %{__prefix}/lib/rpm/magic
+%rpmattr        %{__prefix}/lib/rpm/magic.mgc
+%rpmattr        %{__prefix}/lib/rpm/magic.mime
+%rpmattr        %{__prefix}/lib/rpm/magic.mime.mgc
+%rpmattr        %{__prefix}/lib/rpm/magic.prov
+%rpmattr        %{__prefix}/lib/rpm/magic.req
+%rpmattr        %{__prefix}/lib/rpm/mono-find-provides
+%rpmattr        %{__prefix}/lib/rpm/mono-find-requires
+%rpmattr        %{__prefix}/lib/rpm/perldeps.pl
+%rpmattr        %{__prefix}/lib/rpm/perl.prov
+%rpmattr        %{__prefix}/lib/rpm/perl.req
+%rpmattr        %{__prefix}/lib/rpm/pythondeps.sh
+
+%rpmattr        %{__prefix}/lib/rpm/rpm[bt]
+%rpmattr        %{__prefix}/lib/rpm/rpmdeps
+%rpmattr        %{__prefix}/lib/rpm/trpm
+%rpmattr        %{__prefix}/lib/rpm/u_pkg.sh
+%rpmattr        %{__prefix}/lib/rpm/vpkg-provides.sh
+%rpmattr        %{__prefix}/lib/rpm/vpkg-provides2.sh
 
 %{__mandir}/man8/rpmbuild.8*
 %{__mandir}/man8/rpmdeps.8*
@@ -565,43 +527,43 @@
 %{__libdir}/librpmbuild.so
 %{__mandir}/man8/rpmcache.8*
 %{__mandir}/man8/rpmgraph.8*
-%rpmattr	%{__prefix}/lib/rpm/rpmcache
-%rpmattr	%{__bindir}/rpmgraph
+%rpmattr        %{__prefix}/lib/rpm/rpmcache
+%rpmattr        %{__bindir}/rpmgraph
 
 %files -n popt
 %defattr(-,root,root)
 %{__libdir}/libpopt.so.*
 %{__mandir}/man3/popt.3*
-%lang(cs)	%{__prefix}/*/locale/cs/LC_MESSAGES/popt.mo
-%lang(da)	%{__prefix}/*/locale/da/LC_MESSAGES/popt.mo
-%lang(de)	%{__prefix}/*/locale/de/LC_MESSAGES/popt.mo
-%lang(es)	%{__prefix}/*/locale/es/LC_MESSAGES/popt.mo
-%lang(eu_ES)	%{__prefix}/*/locale/eu_ES/LC_MESSAGES/popt.mo
-%lang(fi)	%{__prefix}/*/locale/fi/LC_MESSAGES/popt.mo
-%lang(fr)	%{__prefix}/*/locale/fr/LC_MESSAGES/popt.mo
-%lang(gl)	%{__prefix}/*/locale/gl/LC_MESSAGES/popt.mo
-%lang(hu)	%{__prefix}/*/locale/hu/LC_MESSAGES/popt.mo
-%lang(id)	%{__prefix}/*/locale/id/LC_MESSAGES/popt.mo
-%lang(is)	%{__prefix}/*/locale/is/LC_MESSAGES/popt.mo
-%lang(it)	%{__prefix}/*/locale/it/LC_MESSAGES/popt.mo
-%lang(ja)	%{__prefix}/*/locale/ja/LC_MESSAGES/popt.mo
-%lang(ko)	%{__prefix}/*/locale/ko/LC_MESSAGES/popt.mo
-%lang(no)	%{__prefix}/*/locale/no/LC_MESSAGES/popt.mo
-%lang(pl)	%{__prefix}/*/locale/pl/LC_MESSAGES/popt.mo
-%lang(pt)	%{__prefix}/*/locale/pt/LC_MESSAGES/popt.mo
-%lang(pt_BR)	%{__prefix}/*/locale/pt_BR/LC_MESSAGES/popt.mo
-%lang(ro)	%{__prefix}/*/locale/ro/LC_MESSAGES/popt.mo
-%lang(ru)	%{__prefix}/*/locale/ru/LC_MESSAGES/popt.mo
-%lang(sk)	%{__prefix}/*/locale/sk/LC_MESSAGES/popt.mo
-%lang(sl)	%{__prefix}/*/locale/sl/LC_MESSAGES/popt.mo
-%lang(sr)	%{__prefix}/*/locale/sr/LC_MESSAGES/popt.mo
-%lang(sv)	%{__prefix}/*/locale/sv/LC_MESSAGES/popt.mo
-%lang(tr)	%{__prefix}/*/locale/tr/LC_MESSAGES/popt.mo
-%lang(uk)	%{__prefix}/*/locale/uk/LC_MESSAGES/popt.mo
-%lang(wa)	%{__prefix}/*/locale/wa/LC_MESSAGES/popt.mo
-%lang(zh)	%{__prefix}/*/locale/zh/LC_MESSAGES/popt.mo
-%lang(zh_CN)	%{__prefix}/*/locale/zh_CN/LC_MESSAGES/popt.mo
-%lang(zh_TW)	%{__prefix}/*/locale/zh_TW/LC_MESSAGES/popt.mo
+%lang(cs)       %{__prefix}/*/locale/cs/LC_MESSAGES/popt.mo
+%lang(da)       %{__prefix}/*/locale/da/LC_MESSAGES/popt.mo
+%lang(de)       %{__prefix}/*/locale/de/LC_MESSAGES/popt.mo
+%lang(es)       %{__prefix}/*/locale/es/LC_MESSAGES/popt.mo
+%lang(eu_ES)    %{__prefix}/*/locale/eu_ES/LC_MESSAGES/popt.mo
+%lang(fi)       %{__prefix}/*/locale/fi/LC_MESSAGES/popt.mo
+%lang(fr)       %{__prefix}/*/locale/fr/LC_MESSAGES/popt.mo
+%lang(gl)       %{__prefix}/*/locale/gl/LC_MESSAGES/popt.mo
+%lang(hu)       %{__prefix}/*/locale/hu/LC_MESSAGES/popt.mo
+%lang(id)       %{__prefix}/*/locale/id/LC_MESSAGES/popt.mo
+%lang(is)       %{__prefix}/*/locale/is/LC_MESSAGES/popt.mo
+%lang(it)       %{__prefix}/*/locale/it/LC_MESSAGES/popt.mo
+%lang(ja)       %{__prefix}/*/locale/ja/LC_MESSAGES/popt.mo
+%lang(ko)       %{__prefix}/*/locale/ko/LC_MESSAGES/popt.mo
+%lang(no)       %{__prefix}/*/locale/no/LC_MESSAGES/popt.mo
+%lang(pl)       %{__prefix}/*/locale/pl/LC_MESSAGES/popt.mo
+%lang(pt)       %{__prefix}/*/locale/pt/LC_MESSAGES/popt.mo
+%lang(pt_BR)    %{__prefix}/*/locale/pt_BR/LC_MESSAGES/popt.mo
+%lang(ro)       %{__prefix}/*/locale/ro/LC_MESSAGES/popt.mo
+%lang(ru)       %{__prefix}/*/locale/ru/LC_MESSAGES/popt.mo
+%lang(sk)       %{__prefix}/*/locale/sk/LC_MESSAGES/popt.mo
+%lang(sl)       %{__prefix}/*/locale/sl/LC_MESSAGES/popt.mo
+%lang(sr)       %{__prefix}/*/locale/sr/LC_MESSAGES/popt.mo
+%lang(sv)       %{__prefix}/*/locale/sv/LC_MESSAGES/popt.mo
+%lang(tr)       %{__prefix}/*/locale/tr/LC_MESSAGES/popt.mo
+%lang(uk)       %{__prefix}/*/locale/uk/LC_MESSAGES/popt.mo
+%lang(wa)       %{__prefix}/*/locale/wa/LC_MESSAGES/popt.mo
+%lang(zh)       %{__prefix}/*/locale/zh/LC_MESSAGES/popt.mo
+%lang(zh_CN)    %{__prefix}/*/locale/zh_CN/LC_MESSAGES/popt.mo
+%lang(zh_TW)    %{__prefix}/*/locale/zh_TW/LC_MESSAGES/popt.mo
 
 # XXX These may end up in popt-devel but it hardly seems worth the effort.
 %{__libdir}/libpopt.a
@@ -722,7 +684,7 @@
 
 * Mon Nov 28 2005 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-8
 - Add elfutils Build Requires to rpmbuild (#155129)
-- Don't do conflicts if both files %ghost(#155256)
+- Don't do conflicts if both files %%ghost(#155256)
 - Fix popt charset for various languages (#172155)
 - Don't include .la file (#174261)
 




More information about the fedora-cvs-commits mailing list