switch to new world order

apt/apt.spec

@@ -38,7 +38,7 @@ Class:        EVAL
 Group:        Bootstrapping
 License:      GPL
 Version:      %{V_base}.%{V_rev}
-Release:      20040207
+Release:      20040217
 
 #   list of sources
 Source0:      http://moin.conectiva.com.br/files/AptRpm/attachments/apt-%{V_base}cnc%{V_rev}.tar.bz2
@@ -54,8 +54,8 @@ Patch0:       apt.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, ncurses, readline, make, gcc, autoconf
-PreReq:       OpenPKG, openpkg >= 20040130, ncurses, readline
+BuildPreReq:  OpenPKG, openpkg >= 20040217, ncurses, readline, make, gcc, autoconf
+PreReq:       OpenPKG, openpkg >= 20040217, ncurses, readline
 AutoReq:      no
 AutoReqProv:  no
 
@@ -80,7 +80,7 @@ AutoReqProv:  no
     %patch -p0
 
     #   replace hard-coded paths with OpenPKG ones
-    l_rpmlibs_base="`%{l_prefix}/bin/rpm-config --libs`"
+    l_rpmlibs_base="`%{l_rpm_config} --libs`"
     l_rpmlibs_extra=""
     case "%{l_platform -t}" in
         *sunos* ) l_rpmlibs_extra="${l_rpmlibs_extra} -lsocket" ;;
@@ -101,9 +101,9 @@ AutoReqProv:  no
         *sunos* ) defines="$defines -DOPENPKG_SOLARIS" ;;
     esac
     CC="%{l_cc}" \
-    CPPFLAGS="%{l_cppflags} `%{l_prefix}/bin/rpm-config --cppflags` $defines" \
-    CFLAGS="%{l_cflags} `%{l_prefix}/bin/rpm-config --cflags`" \
-    LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/rpm-config --ldflags`" \
+    CPPFLAGS="%{l_cppflags} `%{l_rpm_config} --cppflags` $defines" \
+    CFLAGS="%{l_cflags} `%{l_rpm_config} --cflags`" \
+    LDFLAGS="%{l_ldflags} `%{l_rpm_config} --ldflags`" \
     ./configure \
         --prefix=%{l_prefix} \
         --libdir=%{l_prefix}/lib \

perl-openpkg/perl-openpkg.pl

@@ -51,7 +51,7 @@ my $CF = {
     perl_stdin     => "/dev/null",
     files_file     => "-",
     files_unquoted => 0,
-    prog_rpm       => '%path_prefix%/bin/rpm',
+    prog_rpm       => '%path_prefix%/bin/openpkg rpm',
     prog_perl      => '%path_prefix%/bin/perl',
     mode_quiet     => 0,
     mode_verbose   => 0,
@@ -558,7 +558,7 @@ as provided by the RPM build-time environment.
 
 =item B<-R>, B<--rpm> I<file-path>
 
-Filesystem path to RPM program. Default is I<prefix>C</bin/rpm>.
+Filesystem path to RPM program. Default is "I<prefix>C</bin/openpkg rpm>".
 
 =item B<-P>, B<--perl> I<file-path>
 

perl-openpkg/perl-openpkg.spec

@@ -33,8 +33,8 @@ Distribution: OpenPKG
 Class:        BASE
 Group:        Language
 License:      PD
-Version:      20040213
-Release:      20040213
+Version:      20040217
+Release:      20040217
 
 #   list of sources
 Source0:      perl-openpkg.pl
@@ -42,8 +42,8 @@ Source0:      perl-openpkg.pl
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, perl >= 5.8.3
-PreReq:       OpenPKG, openpkg >= 20040130, perl >= 5.8.3
+BuildPreReq:  OpenPKG, openpkg >= 20040217, perl >= 5.8.3
+PreReq:       OpenPKG, openpkg >= 20040217, perl >= 5.8.3
 AutoReq:      no
 AutoReqProv:  no
 

synaptic/synaptic.spec

@@ -34,7 +34,7 @@ Class:        EVAL
 Group:        Bootstrapping
 License:      GPL
 Version:      0.47
-Release:      20040207
+Release:      20040217
 
 #   list of sources
 Source0:      http://savannah.nongnu.org/download/synaptic/synaptic.pkg/%{version}/synaptic-%{version}.tar.gz
@@ -43,8 +43,8 @@ Patch0:       synaptic.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, X11, gtk, libglade, apt, gcc, make
-PreReq:       OpenPKG, openpkg >= 20040130, X11, gtk, libglade, apt
+BuildPreReq:  OpenPKG, openpkg >= 20040217, X11, gtk, libglade, apt, gcc, make
+PreReq:       OpenPKG, openpkg >= 20040217, X11, gtk, libglade, apt
 AutoReq:      no
 AutoReqProv:  no
 
@@ -69,7 +69,7 @@ AutoReqProv:  no
     touch help/C/html_timestamp
 
 %build
-    libs="`%{l_prefix}/bin/rpm-config --libs`"
+    libs="`%{l_rpm_config} --libs`"
     case "%{l_platform -t}" in
         *-freebsd4* ) libs="$libs -lc_r"     ;;
         *-freebsd5* ) libs="$libs -lpthread" ;;