summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--po/Makefile4
-rw-r--r--urpmi.spec28
3 files changed, 31 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index b411168b..46c451ba 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@ PREFIX =
BINDIR = $(PREFIX)/usr/bin
MANDIR = $(PREFIX)/usr/man
SBINDIR = $(PREFIX)/usr/sbin
-XBINDIR = $(PREFIX)/usr/X11R6/bin
URPMIDIR = $(PREFIX)/var/lib/urpmi
URPMIDIR2 = $(PREFIX)/etc/urpmi
LOCALEDIR = $(PREFIX)/usr/share/locale
@@ -17,7 +16,7 @@ LOG = $(NAME).logrotate
install:
$(MAKE) -C po $@
- install -d $(BINDIR) $(SBINDIR) $(XBINDIR) $(URPMIDIR) $(URPMIDIR2) $(MANDIR)/man8
+ install -d $(BINDIR) $(SBINDIR) $(URPMIDIR) $(URPMIDIR2) $(MANDIR)/man8
install urpmq $(BINDIR)
install _irpm rpm-find-leaves urpmf $(BINDIR)
install -m 644 autoirpm.deny $(URPMIDIR2)
@@ -27,7 +26,8 @@ install:
# install -s autoirpm.update-all $(SBINDIR)
# ln -sf urpmi.addmedia $(SBINDIR)/urpmi.removemedia
# ln -sf urpmi.addmedia $(SBINDIR)/urpmi.update
- install gurpmi $(XBINDIR)
+ install gurpmi $(SBINDIR)
+ ln -s -f ../../usr/bin/consolehelper $(BINDIR)/gurpmi
for i in man/??* ; \
do install -d $(MANDIR)/`basename $$i`/man8 ; \
install -m 644 $$i/*.8 $(MANDIR)/`basename $$i`/man8 ; \
diff --git a/po/Makefile b/po/Makefile
index eed5822c..f60af489 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -23,6 +23,9 @@ all: $(GOALS)
%.mo: %.po
msgfmt -o $@ $<
+placeholder.h:
+ ./create_placeholder
+
$(PL_CFILES): %_.c: %
./fake_c.pl $< > $@
@@ -34,7 +37,6 @@ merge: $(PGOAL).pot
done
$(PGOAL).pot: $(PL_CFILES) $(CFILES)
- ./create_placeholder
xgettext --default-domain=$(PGOAL) -F -n \
--add-comments='-PO' --add-comments=' Translator:'\
--keyword=_ --keyword=__ --keyword=N_ --keyword=gettext \
diff --git a/urpmi.spec b/urpmi.spec
index d320aae2..29802815 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 4.0
-Release: 9mdk
+Release: 10mdk
License: GPL
Source0: %{name}.tar.bz2
Source1: %{name}.logrotate
@@ -22,7 +22,7 @@ You can compare rpm vs. urpmi with insmod vs. modprobe
%package -n gurpmi
Summary: User mode rpm GUI install
-Requires: urpmi grpmi gchooser gmessage
+Requires: urpmi grpmi gchooser gmessage consolehelper menu
Group: %{group}
%description -n gurpmi
gurpmi is a graphical front-end to urpmi
@@ -94,6 +94,21 @@ cd $RPM_BUILD_ROOT%{_bindir} ; mv -f rpm-find-leaves urpmi_rpm-find-leaves
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/urpmi
+mkdir -p $RPM_BUILD_ROOT%{_menudir}
+cat << EOF > $RPM_BUILD_ROOT%{_menudir}/gurpmi
+?package(gurpmi): command="%{_bindir}/gurpmi" needs="gnome" section=".hidden" \
+section=".hidden" \
+title="Software installer" longtitle="Graphical front end to install RPM files" \
+mimetypes="application/x-rpm" \
+multiple_files="true"
+?package(gurpmi): command="%{_bindir}/gurpmi" needs="kde" section=".hidden" \
+section=".hidden" \
+title="Software installer" longtitle="Graphical front end to install RPM files" \
+mimetypes="application/x-rpm" \
+multiple_files="true"
+EOF
+
+
%find_lang %{name}
%clean
@@ -152,7 +167,10 @@ fi
%files -n gurpmi
%defattr(-,root,root)
-/usr/X11R6/bin/gurpmi
+%{_sbindir}/gurpmi
+%{_bindir}/gurpmi
+%{_menudir}/gurpmi
+
#%files -n autoirpm
#%defattr(-,root,root)
@@ -178,6 +196,10 @@ fi
%changelog
+* Fri Aug 30 2002 Frederic Crozat <fcrozat@mandrakesoft.com> 4.0-10mdk
+- (fcrozat) Move gurpmi to /usr/sbin and add consolehelper support for it
+ and register it to handle application/x-rpm mimetype.
+
* Thu Aug 29 2002 François Pons <fpons@mandrakesoft.com> 4.0-9mdk
- added --list-nodes to list nodes used when in parallel mode.
- moved some initialisation for parallel mode to allow user