aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--rpmdrake.menu2
-rw-r--r--rpmdrake.spec10
3 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index d93ca2a1..c30e3703 100644
--- a/Makefile
+++ b/Makefile
@@ -40,18 +40,18 @@ install: $(ALL)
install rpmdrake park-rpmdrake edit-urpm-sources.pl gurpmi.addmedia $(SBINDIR)
perl -pi -e 's|use strict.*||;s|use vars.*||;s|use diagnostics.*||;s|#-.*||' $(SBINDIR)/*
ln -sf rpmdrake $(SBINDIR)/rpmdrake-remove
- ln -sf rpmdrake $(SBINDIR)/MandrakeUpdate
+ ln -sf rpmdrake $(SBINDIR)/MandrivaUpdate
install -d $(BINDIR)
ln -sf $(RELATIVE_SBIN)/rpmdrake $(BINDIR)/rpmdrake
ln -sf $(RELATIVE_SBIN)/rpmdrake-remove $(BINDIR)/rpmdrake-remove
- ln -sf $(RELATIVE_SBIN)/MandrakeUpdate $(BINDIR)/MandrakeUpdate
+ ln -sf $(RELATIVE_SBIN)/MandrivaUpdate $(BINDIR)/MandrivaUpdate
ln -sf $(RELATIVE_SBIN)/edit-urpm-sources.pl $(BINDIR)/edit-urpm-sources.pl
ln -sf edit-urpm-sources.pl $(SBINDIR)/drakrpm-edit-media
ln -sf $(RELATIVE_SBIN)/drakrpm-edit-media $(BINDIR)/drakrpm-edit-media
ln -sf $(RELATIVE_SBIN)/gurpmi.addmedia $(BINDIR)/gurpmi.addmedia
ln -sf $(RELATIVE_SBIN)/rpmdrake $(BINDIR)/drakrpm
ln -sf $(RELATIVE_SBIN)/rpmdrake-remove $(BINDIR)/drakrpm-remove
- ln -sf $(RELATIVE_SBIN)/MandrakeUpdate $(BINDIR)/drakrpm-update
+ ln -sf $(RELATIVE_SBIN)/MandrivaUpdate $(BINDIR)/drakrpm-update
install -d $(DATADIR)/rpmdrake/icons
install -m644 icons/*.png $(DATADIR)/rpmdrake/icons
install -m644 compssUsers.flat.default $(DATADIR)/rpmdrake
diff --git a/rpmdrake.menu b/rpmdrake.menu
index 9570b4fd..e68a3bad 100644
--- a/rpmdrake.menu
+++ b/rpmdrake.menu
@@ -1,7 +1,7 @@
?package(rpmdrake): command="/usr/sbin/rpmdrake" needs="x11" section="System/Configuration/Packaging" icon="rpmdrake.png" title="Browse Available Software" longtitle="A graphical front end for browsing available packages for installation (no root password needed)"
?package(rpmdrake): command="/usr/sbin/rpmdrake --root" needs="x11" section="System/Configuration/Packaging" icon="rpmdrake.png" title="Install Software" longtitle="A graphical front end for installing packages"
?package(rpmdrake): command="/usr/sbin/rpmdrake-remove --root" needs="x11" section="System/Configuration/Packaging" icon="rpmdrake-remove.png" title="Remove Software" longtitle="A graphical front end for removing packages"
-?package(rpmdrake): command="/usr/sbin/MandrakeUpdate" needs="x11" section="System/Configuration/Packaging" icon="mandrakeupdate.png" title="Mandrakelinux Update" longtitle="A graphical front end for software updates"
+?package(rpmdrake): command="/usr/sbin/MandrivaUpdate" needs="x11" section="System/Configuration/Packaging" icon="mandrakeupdate.png" title="Mandriva Update" longtitle="A graphical front end for software updates"
?package(rpmdrake): command="/usr/bin/edit-urpm-sources.pl" needs="x11" section="System/Configuration/Packaging" icon="edit-urpm-sources.png" title="Software Media Manager" longtitle="A graphical front end to add/remove/edit media for installing packages"
?package(rpmdrake): command="/usr/sbin/gurpmi.addmedia" needs="gnome" section=".hidden" title="Medium installer" mimetypes="application/x-urpmi-media" longtitle="A graphical front end for adding media"
?package(rpmdrake): command="/usr/sbin/gurpmi.addmedia" needs="kde" section=".hidden" InitialPreference="9" title="Medium installer" mimetypes="application/x-urpmi-media" longtitle="A graphical front end for adding media"
diff --git a/rpmdrake.spec b/rpmdrake.spec
index b7fcda17..3e2e1044 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -15,7 +15,7 @@ Version: %{version}
Release: %{release}
License: GPL
Source0: %name-%version.tar.bz2
-Summary: Mandrakelinux graphical front end for choosing packages for installion/removal
+Summary: Mandriva Linux graphical front end for choosing packages for installion/removal
Requires: perl-MDK-Common >= 1.1.18-2mdk
Requires: urpmi >= 4.6.19
Requires: perl-URPM >= 1.09
@@ -29,17 +29,17 @@ Requires: perl-Compress-Zlib >= 1.33
BuildRequires: curl-devel >= 7.12.1-1mdk gettext openssl-devel perl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Group: System/Configuration/Packaging
-URL: http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/rpmdrake/
+URL: http://cvs.mandriva.com/cgi-bin/cvsweb.cgi/soft/rpmdrake/
Obsoletes: MandrakeUpdate
Provides: MandrakeUpdate
Conflicts: drakconf < 10.1-4mdk
%description
rpmdrake is a simple graphical frontend to manage software packages on a
-Mandrakelinux system; it has 3 different modes:
+Mandriva Linux system; it has 3 different modes:
- software packages installation;
- software packages removal;
-- MandrakeUpdate (software packages updates).
+- MandrivaUpdate (software packages updates).
A fourth program manages the media (add, remove, edit).
@@ -92,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root)
%doc COPYING AUTHORS README
%{_sbindir}/rpmdrake*
-%{_sbindir}/MandrakeUpdate
+%{_sbindir}/MandrivaUpdate
%{_sbindir}/edit-urpm-*
%{_sbindir}/drakrpm-edit-media
%{_sbindir}/gurpmi.addmedia