diff options
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | rpmdrake.spec | 14 |
2 files changed, 22 insertions, 7 deletions
@@ -18,6 +18,8 @@ DIRS = grpmi po data PREFIX = /usr/local DATADIR = $(PREFIX)/share BINDIR = $(PREFIX)/bin +SBINDIR = $(PREFIX)/sbin +RELATIVE_SBIN = ../sbin all: dirs @@ -30,11 +32,14 @@ install: $(ALL) @for n in $(DIRS); do \ (cd $$n; $(MAKE) install) \ done - install -d $(BINDIR) - install rpmdrake edit-urpm-sources.pl $(BINDIR) - perl -pi -e 's|use strict.*||;s|use vars.*||;s|use diagnostics.*||;s|#-.*||' $(BINDIR)/* - ln -s -f rpmdrake $(BINDIR)/rpmdrake-remove - ln -s -f rpmdrake $(BINDIR)/MandrakeUpdate + install -d $(SBINDIR) + install rpmdrake edit-urpm-sources.pl $(SBINDIR) + perl -pi -e 's|use strict.*||;s|use vars.*||;s|use diagnostics.*||;s|#-.*||' $(SBINDIR)/* + ln -s -f rpmdrake $(SBINDIR)/rpmdrake-remove + ln -s -f rpmdrake $(SBINDIR)/MandrakeUpdate + ln -sf $(RELATIVE_SBIN)/rpmdrake $(BINDIR)/rpmdrake + ln -sf $(RELATIVE_SBIN)/rpmdrake-remove $(BINDIR)/rpmdrake-remove + ln -sf $(RELATIVE_SBIN)/MandrakeUpdate $(BINDIR)/MandrakeUpdate install -d $(DATADIR)/rpmdrake/icons install -m644 icons/*.png $(DATADIR)/rpmdrake/icons install -m644 compssUsers.flat.default $(DATADIR)/rpmdrake diff --git a/rpmdrake.spec b/rpmdrake.spec index 3894e034..98eb199c 100644 --- a/rpmdrake.spec +++ b/rpmdrake.spec @@ -8,7 +8,7 @@ %define name rpmdrake %define version 2.0 -%define release 17mdk +%define release 18mdk Name: %{name} Version: %{version} @@ -50,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT make OPTIMIZE="$RPM_OPT_FLAGS -Wall" PREFIX=%{_prefix} INSTALLDIRS=vendor %install -make install PREFIX=$RPM_BUILD_ROOT/%{_prefix} BINDIR=$RPM_BUILD_ROOT/%{_sbindir} +make install PREFIX=$RPM_BUILD_ROOT/%{_prefix} BINDIR=$RPM_BUILD_ROOT/%{_bindir} SBINDIR=$RPM_BUILD_ROOT/%{_sbindir} mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib} install -m 644 rpmdrake.pm $RPM_BUILD_ROOT/%{perl_vendorlib} @@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/rpmdrake* %{_sbindir}/MandrakeUpdate %{_sbindir}/edit-urpm-sources.pl +%{_bindir}/rpmdrake* +%{_bindir}/MandrakeUpdate +%{_bindir}/edit-urpm-sources.pl %{_datadir}/rpmdrake %{perl_vendorlib}/*.pm %{_menudir}/%{name} @@ -113,6 +116,13 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/*.pm %changelog +* Mon Sep 2 2002 Guillaume Cottenceau <gc@mandrakesoft.com> 2.0-18mdk +- rpmdrake: + - fix displaying of dependencies: sometimes, when some packages + can't be selected, it didn't correctly display the + dependencies + - add symlinks in /usr/bin so that user has the binaries in his path + * Fri Aug 30 2002 Guillaume Cottenceau <gc@mandrakesoft.com> 2.0-17mdk - rpmdrake: - support proxies using /etc/urpmi/proxy.cfg |