summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenaud Chaillat <rchaillat@mandriva.com>2001-08-31 12:53:02 +0000
committerRenaud Chaillat <rchaillat@mandriva.com>2001-08-31 12:53:02 +0000
commitccbe539209df7c35ce55875d2cb7c97eb5b91000 (patch)
treee6144f65f6c22d750d9752d14db29da2fd6725f9
parent99378262e730ac0ef0c52fadb6a49ec190cbe63c (diff)
downloadmgaonline-ccbe539209df7c35ce55875d2cb7c97eb5b91000.tar
mgaonline-ccbe539209df7c35ce55875d2cb7c97eb5b91000.tar.gz
mgaonline-ccbe539209df7c35ce55875d2cb7c97eb5b91000.tar.bz2
mgaonline-ccbe539209df7c35ce55875d2cb7c97eb5b91000.tar.xz
mgaonline-ccbe539209df7c35ce55875d2cb7c97eb5b91000.zip
make rpm now works
-rw-r--r--Makefile2
-rw-r--r--mdkonline.spec18
2 files changed, 10 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index a0076681..3f1b0668 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ install: all
$(MAKE) -C po $@
install -d $(RPM_BUILD_ROOT)/usr/{X11R6/bin/,share/icons,share/mdkonline/pixmaps}
install -s -m755 $(NAME) $(RPM_BUILD_ROOT)/usr/X11R6/bin/
- install -m644 icons/*.png $(RPM_BUILD_ROOT)/usr/share/icons/
+# install -m644 icons/*.png $(RPM_BUILD_ROOT)/usr/share/icons/
install -m644 pixmaps/*.png $(RPM_BUILD_ROOT)/usr/share/mdkonline/pixmaps
for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
diff --git a/mdkonline.spec b/mdkonline.spec
index 7a0d81a5..c61316aa 100644
--- a/mdkonline.spec
+++ b/mdkonline.spec
@@ -9,9 +9,9 @@ Release: 2mdk
# get the source from our cvs repository (see
# http://www.linuxmandrake.com/en/cvs.php3)
Source0: %{name}-%{version}.tar.bz2
-Source1: %{name}16.xpm.bz2
-Source2: %{name}32.xpm.bz2
-Source3: %{name}48.xpm.bz2
+#Source1: %{name}16.xpm.bz2
+#Source2: %{name}32.xpm.bz2
+#Source3: %{name}48.xpm.bz2
Copyright: GPL
Group: System/Configuration/Other
Requires: drakxtools >= 1.1.5-97mdk, gtk+mdk, perl-GTK, perl-GTK-GdkImlib, usermode,
@@ -50,9 +50,9 @@ EOF
#install menu icon
mkdir -p $RPM_BUILD_ROOT%{_miconsdir}
mkdir -p $RPM_BUILD_ROOT%{_liconsdir}
-bzcat %{SOURCE1} > $RPM_BUILD_ROOT%{_miconsdir}/%{name}.xpm
-bzcat %{SOURCE2} > $RPM_BUILD_ROOT%{_iconsdir}/%{name}.xpm
-bzcat %{SOURCE3} > $RPM_BUILD_ROOT%{_liconsdir}/%{name}.xpm
+#bzcat %{SOURCE1} > $RPM_BUILD_ROOT%{_miconsdir}/%{name}.xpm
+#bzcat %{SOURCE2} > $RPM_BUILD_ROOT%{_iconsdir}/%{name}.xpm
+#bzcat %{SOURCE3} > $RPM_BUILD_ROOT%{_liconsdir}/%{name}.xpm
%post
%{update_menus}
@@ -68,9 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/X11R6/bin/*
%{_datadir}/%{name}
%{_menudir}/%{name}
-%{_miconsdir}/*.xpm
-%{_iconsdir}/*.xpm
-%{_liconsdir}/*.xpm
+#%{_miconsdir}/*.xpm
+#%{_iconsdir}/*.xpm
+#%{_liconsdir}/*.xpm
%changelog
* Fri Aug 31 2001 Renaud Chaillat <rchaillat@mandrakesoft.com> 0.15-2mdk