summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Baudens <baudens@mandriva.com>2002-07-31 11:42:33 +0000
committerDavid Baudens <baudens@mandriva.com>2002-07-31 11:42:33 +0000
commit6145f02c8e1a55375623850d079fc6e789a98ce6 (patch)
tree6d1ce71a7af12cd96701fbb4747e1ef178a96ff4
parent491497bd92c7cd1a061688df1532339cd15f4023 (diff)
downloadmgaonline-6145f02c8e1a55375623850d079fc6e789a98ce6.tar
mgaonline-6145f02c8e1a55375623850d079fc6e789a98ce6.tar.gz
mgaonline-6145f02c8e1a55375623850d079fc6e789a98ce6.tar.bz2
mgaonline-6145f02c8e1a55375623850d079fc6e789a98ce6.tar.xz
mgaonline-6145f02c8e1a55375623850d079fc6e789a98ce6.zip
Fix "make rpm" ; update spec
-rw-r--r--Makefile1
-rw-r--r--mdkonline.spec19
2 files changed, 10 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index d906fc64..874f2c34 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,6 @@ dis: clean
rpm: dis ../$(NAME)-$(VERSION).tar.bz2 $(RPM)
cp -f ../$(NAME)-$(VERSION).tar.bz2 $(RPM)/SOURCES
- cp -f icons/*.png.bz2 $(RPM)/SOURCES
cp -f $(NAME).spec $(RPM)/SPECS/
rpm -ba --clean --rmsource $(NAME).spec
rm -f ../$(NAME)-$(VERSION).tar.bz2
diff --git a/mdkonline.spec b/mdkonline.spec
index 899e01d9..4f23f742 100644
--- a/mdkonline.spec
+++ b/mdkonline.spec
@@ -5,20 +5,17 @@
Summary: The Mandrake Online Tool
Name: %{name}
Version: %{version}
-Release: 24mdk
+Release: 25mdk
# get the source from our cvs repository (see
# http://www.linuxmandrake.com/en/cvs.php3)
Source0: %{name}-%{version}.tar.bz2
-Source1: %{name}16.png.bz2
-Source2: %{name}32.png.bz2
-Source3: %{name}48.png.bz2
-URL: http://people.mandrakesoft.com/~daouda/mandrake/mdkonline.html
+URL: http://www.mandrakesoft.com/
License: GPL
Group: System/Configuration/Other
Requires: drakxtools >= 1.1.5-97mdk, gtk+mdk, perl-GTK, perl-GTK-GdkImlib, usermode
Requires: popt >= 1.6, perl-libwww-perl, perl-Crypt-SSLeay >= 0.37
BuildRoot: %{_tmppath}/%{name}-buildroot
-BuildArchitectures: noarch
+BuildArch: noarch
%description
The Mandrake Online tool is designed for registered users
@@ -64,9 +61,9 @@ EOF
#install menu icon
mkdir -p $RPM_BUILD_ROOT%{_miconsdir}
mkdir -p $RPM_BUILD_ROOT%{_liconsdir}
-bzcat %{SOURCE1} > $RPM_BUILD_ROOT%{_miconsdir}/%{name}.png
-bzcat %{SOURCE2} > $RPM_BUILD_ROOT%{_iconsdir}/%{name}.png
-bzcat %{SOURCE3} > $RPM_BUILD_ROOT%{_liconsdir}/%{name}.png
+install -m 0644 $RPM_BUILD_DIR/%name-%version/icons/mdkonline16.png $RPM_BUILD_ROOT%{_miconsdir}/%{name}.png
+install -m 0644 $RPM_BUILD_DIR/%name-%version/icons/mdkonline32.png $RPM_BUILD_ROOT%{_iconsdir}/%{name}.png
+install -m 0644 $RPM_BUILD_DIR/%name-%version/icons/mdkonline48.png $RPM_BUILD_ROOT%{_liconsdir}/%{name}.png
%post
%{update_menus}
@@ -94,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT
%{_liconsdir}/*.png
%changelog
+* Wed Jul 31 2002 David BAUDENS <baudens@mandrakesoft.com> 0.15-25mdk
+- New 16 & 48 icons.
+- Fix "make rpm"
+
* Sat Jul 20 2002 Daouda LO <daouda@mandrakesoft.com> 0.15-24mdk
- 32 x 32 new icon.