no_comment

5 files changed, 32 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index be216c65..5f0755b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-29  Pixel  <pixel@mandrakesoft.com>
+
+	* urpmi.addmedia, urpmf, autoirpm.update: nice fixes from diablero
+
 2000-06-03  Pixel  <pixel@mandrakesoft.com>
 
 	* urpmi.addmedia (substInFile): die if no rpm were found
diff --git a/autoirpm.update b/autoirpm.update
index 765aea6f..74aea982 100644
--- a/autoirpm.update
+++ b/autoirpm.update
@@ -7,7 +7,7 @@ $BASE2 = "$DIR2/autoirpm";
 $AUTO_INSTALL_BIN_LIST = "$BASE.binaries";
 $INSTALL_SCRIPT_REP = "$BASE.scripts";
 
-system("bzip2 -dc $DIR/hdlist*.cz2 2>/dev/null | autoirpm.update-all $BASE2.allow $BASE2.deny - > $AUTO_INSTALL_BIN_LIST");
+system("bzip2 -dcq $DIR/hdlist*.cz2 | autoirpm.update-all $BASE2.allow $BASE2.deny - > $AUTO_INSTALL_BIN_LIST");
 $? == 0  or die "autoirpm.upgrade-all failed\n";
 
 open F, $AUTO_INSTALL_BIN_LIST or die;
diff --git a/urpmf b/urpmf
index e959cdac..8246179c 100755
--- a/urpmf
+++ b/urpmf
@@ -16,7 +16,7 @@ if ls $dir/hdlist.*.gz >/dev/null 2>/dev/null; then
 fi
 if ls $dir/hdlist.*.cz2 >/dev/null 2>/dev/null; then
     found=1
-    bzip2 -dc $dir/hdlist.*.cz2 2>/dev/null | hdlist2files - | grep -E "$1"
+    bzip2 -dcq $dir/hdlist.*.cz2 | hdlist2files - | grep -E "$1"
 fi
 if [ "$found" != "1" ]; then
     echo "urpmi is not installed"
diff --git a/urpmi.addmedia b/urpmi.addmedia
index dd2ba957..acd4ee43 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -107,8 +107,8 @@ my $mask = umask 077;
 open LIST, ">$RPMLIST" or die "can't output $RPMLIST";
 umask $mask;
 
-open F, "bzip2 -dc $HDLIST 2>/dev/null | hdlist2names - |";
-foreach (<F>) {
+open F, "bzip2 -dcq $HDLIST | hdlist2names - |";
+while (<F>) {
     chomp;
     print LIST "$url/$_\n";
 }
diff --git a/urpmi.spec b/urpmi.spec
index d118cef9..8b066b64 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -1,13 +1,13 @@
 %define group System/Configuration/Packaging
 
 Name: urpmi
-Version: 1.1
-Release: 7mdk
+Version: 1.2
+Release: 2mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Summary: User mode rpm install
 Requires: /usr/bin/suidperl, rpmtools >= 1.1, eject, wget
-BuildRoot: /tmp/%{name}
+BuildRoot: %{_tmppath}/%{name}
 
 Group: %{group}
 %description
@@ -42,14 +42,14 @@ Auto install of rpm on demand
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make PREFIX=$RPM_BUILD_ROOT install
+make PREFIX=$RPM_BUILD_ROOT MANDIR=$RPM_BUILD_ROOT%{_mandir} install
 install -d $RPM_BUILD_ROOT/var/lib/urpmi/autoirpm.scripts
 install -m 644 autoirpm.deny $RPM_BUILD_ROOT/etc/urpmi
 
-echo "echo 'Use urpmf instead'" > $RPM_BUILD_ROOT/usr/bin/rpmf
-chmod a+x $RPM_BUILD_ROOT/usr/bin/rpmf
+echo "echo 'Use urpmf instead'" > $RPM_BUILD_ROOT%{_bindir}/rpmf
+chmod a+x $RPM_BUILD_ROOT%{_bindir}/rpmf
 
-cd $RPM_BUILD_ROOT/usr/bin ; mv -f rpm-find-leaves urpmi_rpm-find-leaves
+cd $RPM_BUILD_ROOT%{_bindir} ; mv -f rpm-find-leaves urpmi_rpm-find-leaves
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,14 +65,14 @@ autoirpm.uninstall
 %defattr(-,root,root)
 %attr(0755, root, urpmi) %dir /etc/urpmi
 %attr(0755, root, urpmi) %dir /var/lib/urpmi
-%attr(4750, root, urpmi) /usr/bin/urpmi
-/usr/bin/urpmi_rpm-find-leaves
-/usr/bin/rpmf
-/usr/bin/urpmf
-/usr/sbin/urpme
-/usr/sbin/urpmi.*
+%attr(4750, root, urpmi) %{_bindir}/urpmi
+%{_bindir}/urpmi_rpm-find-leaves
+%{_bindir}/rpmf
+%{_bindir}/urpmf
+%{_sbindir}/urpme
+%{_sbindir}/urpmi.*
+%{_mandir}/*/urpm*
 /usr/share/locale/*/LC_MESSAGES/urpmi.po
-/usr/man/man*/urpm*
 
 %files -n gurpmi
 %defattr(-,root,root)
@@ -81,14 +81,20 @@ autoirpm.uninstall
 %files -n autoirpm
 %defattr(-,root,root)
 %dir /var/lib/urpmi/autoirpm.scripts
-/etc/urpmi/autoirpm.deny
-/usr/sbin/autoirpm.*
-/usr/man/man*/autoirpm*
-/usr/bin/_irpm
+%config(noreplace) /etc/urpmi/autoirpm.deny
+%{_sbindir}/autoirpm.*
+%{_mandir}/*/autoirpm*
+%{_bindir}/_irpm
 %doc README-autoirpm-icons autoirpm.README
 
 
 %changelog
+* Wed Jul 19 2000 Pixel <pixel@mandrakesoft.com> 1.2-2mdk
+- macroization, BM
+
+* Thu Jun 29 2000 Pixel <pixel@mandrakesoft.com> 1.2-1mdk
+- nice fixes from diablero (mainly better generation of list.*)
+
 * Tue Jun 13 2000 Pixel <pixel@mandrakesoft.com> 1.1-7mdk
 - add require wget (needed for ftp hdlist's)