- some reorders (rpm[dkqv] should rather belong to main package - if present)

- updated find-spec-bcond script

Changed files:
    rpm-find-spec-bcond -> 1.3
    rpm.spec -> 1.430

diff --git a/rpm-find-spec-bcond b/rpm-find-spec-bcond
index 0db70f80124e83581fad66eb275080ec93ceddbd..82343531a0e501dde88922ad9880ece3e9c3277c 100644 (file)
--- a/rpm-find-spec-bcond
+++ b/rpm-find-spec-bcond
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Display bcond_* macros from given spec 
+# Display bcond (_with_*, _without_*) macros from given spec 
 # $Id$
 
 if [ "$#" = 0 ]; then
@@ -23,8 +23,8 @@ fi
 
 bconds=`awk -F"\n" 'BEGIN { chlog=0 }
                /^%changelog/ { chlog=1 }
-               /bcond_[_a-z0-9]+/ && chlog == 0 {
-                       match($0, /bcond_[_a-z0-9]+/);
+               /_with(out)?_[_a-z0-9]+/ && chlog == 0 {
+                       match($0, /_with(out)?_[_a-z0-9]+/);
                        print substr($0, RSTART, RLENGTH)                       
                }' $SPEC | sort -u`
 

diff --git a/rpm.spec b/rpm.spec
index 37eb7353514292583c9e22aacf30e514af8540a7..169a26f89c2c70a3a57d3f0497982030ba665fe7 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -630,8 +630,8 @@ install -d $RPM_BUILD_ROOT/var/spool/repackage
 
 # move libs to /lib
 for a in librpm-%{ver}.so librpmdb-%{ver}.so librpmio-%{ver}.so ; do
-       mv -f $RPM_BUILD_ROOT/%{_libdir}/$a $RPM_BUILD_ROOT/lib/
-       ln -s /lib/$a $RPM_BUILD_ROOT/%{_libdir}/$a
+       mv -f $RPM_BUILD_ROOT%{_libdir}/$a $RPM_BUILD_ROOT/lib
+       ln -s /lib/$a $RPM_BUILD_ROOT%{_libdir}/$a
 done
 
 %find_lang %{name}
@@ -654,6 +654,10 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 %doc RPM-PGP-KEY CHANGES manual
 
 %attr(755,root,root) /bin/rpm
+#%attr(755,root,root) %{_bindir}/rpmdb
+#%attr(755,root,root) %{_bindir}/rpmquery
+#%attr(755,root,root) %{_bindir}/rpmsign
+#%attr(755,root,root) %{_bindir}/rpmverify
 
 %dir %{_sysconfdir}/rpm
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/rpm/macros
@@ -669,6 +673,9 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 %dir /var/lib/rpm
 %dir %attr(700,root,root) /var/spool/repackage
 %dir %{_libdir}/rpm
+#%attr(755,root,root) %{_libdir}/rpm/rpmd
+#%attr(755,root,root) %{_libdir}/rpm/rpmk
+#%attr(755,root,root) %{_libdir}/rpm/rpm[qv]
 
 %doc %attr(755,root,root) %{_libdir}/rpm/convertrpmrc.sh
 
@@ -757,15 +764,9 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_bindir}/rpmdeps
 %attr(755,root,root) %{_bindir}/rpmgraph
 %attr(755,root,root) %{_bindir}/rpmfile
-#%attr(755,root,root) %{_bindir}/striptofile
-#%attr(755,root,root) %{_bindir}/unstripfile
 %attr(755,root,root) %{_libdir}/rpm/find-debuginfo.sh
 %attr(755,root,root) %{_libdir}/rpm/rpm2cpio.sh
-#%attr(755,root,root) %{_libdir}/rpm/rpmd
 %attr(755,root,root) %{_libdir}/rpm/rpmdiff*
-#%attr(755,root,root) %{_libdir}/rpm/rpmk
-#%attr(755,root,root) %{_libdir}/rpm/rpmq
-#%attr(755,root,root) %{_libdir}/rpm/rpmv
 %attr(755,root,root) %{_libdir}/rpm/tgpg
 %attr(755,root,root) %{_libdir}/rpm/rpmdb_loadcvt
 
@@ -785,7 +786,8 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 
 %files utils-static
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/rpm/rpmi
+%attr(755,root,root) %{_bindir}/rpm[ieu]
+%attr(755,root,root) %{_libdir}/rpm/rpm[ieu]
 
 %files perlprov
 %defattr(644,root,root,755)