summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaouda Lo <daouda@mandriva.com>2004-11-03 10:51:24 +0000
committerDaouda Lo <daouda@mandriva.com>2004-11-03 10:51:24 +0000
commit88c4a3312728256beef84c5fa97d52528ba821bb (patch)
tree3065ecbdd7ad195801b058089a6209ec9daecdf4
parented5e4289bf1c260d596d40805031c13b87338295 (diff)
downloadmgaonline-88c4a3312728256beef84c5fa97d52528ba821bb.tar
mgaonline-88c4a3312728256beef84c5fa97d52528ba821bb.tar.gz
mgaonline-88c4a3312728256beef84c5fa97d52528ba821bb.tar.bz2
mgaonline-88c4a3312728256beef84c5fa97d52528ba821bb.tar.xz
mgaonline-88c4a3312728256beef84c5fa97d52528ba821bb.zip
- remove mdkonline-backend
-rw-r--r--mdkonline.spec33
1 files changed, 9 insertions, 24 deletions
diff --git a/mdkonline.spec b/mdkonline.spec
index 7be423a3..000adb8b 100644
--- a/mdkonline.spec
+++ b/mdkonline.spec
@@ -10,20 +10,12 @@ Source0: %{name}-%{version}.tar.bz2
URL: http://www.mandrakeonline.net
License: GPL
Group: System/Configuration/Other
-Requires: %{name}-backend = %{version}-%{release}, drakfirsttime >= 1.0-0.6mdk
-Requires: perl-Gtk2-TrayIcon >= 0.03-3mdk
+Requires: drakxtools-newt, perl-Gtk2-TrayIcon >= 0.03-3mdk, perl-Crypt-SSLeay >= 0.51-2mdk
+#Requires: hwdb-clients >= 0.15.1-1mdk
BuildRequires: gettext
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildArch: noarch
-%package backend
-Summary: MandrakeOnline libraries and background tools
-Group: System/Configuration/Other
-Requires: drakxtools-newt
-Requires: perl-Crypt-SSLeay >= 0.51-2mdk
-#Requires: hwdb-clients >= 0.15.1-1mdk
-Conflicts: %{name} < 1.1-4mdk
-
%description
The MandrakeOnline tool is designed for registered users
who want to upload their configuration (packages, hardware infos).
@@ -37,9 +29,6 @@ The package include :
* Mdkapplet which is a KDE/Gnome applet for security updates
notification and installation.
-%description backend
-This package contains the mdkonline library and backend tools.
-
%prep
%setup -q
@@ -86,8 +75,7 @@ EOF
%post
%{update_menus}
-%post backend
-
+%post
if [ -r /etc/cron.daily/mdkupdate ]; then
perl -p -i -e 's!/usr/bin/mdkupdate!/usr/sbin/mdkupdate!' /etc/cron.daily/mdkupdate
fi
@@ -98,27 +86,22 @@ fi
%clean
rm -rf $RPM_BUILD_ROOT
-%files backend
-%defattr(-,root,root)
-%{_sbindir}/mdkupdate
-%{_sbindir}/mdkonline_tui
-%dir %{_prefix}/lib/libDrakX/drakfirsttime
-%{_prefix}/lib/libDrakX/drakfirsttime/*.pm
-
%files -f %{name}.lang
%defattr(-,root,root)
%doc COPYING ChangeLog
+%{_sbindir}/mdkupdate
%{_sbindir}/mdkonline
%{_sbindir}/drakonline
%{_bindir}/*
%{_prefix}/X11R6/bin/*
+%dir %{_prefix}/lib/libDrakX/drakfirsttime
+%{_prefix}/lib/libDrakX/drakfirsttime/*.pm
%{_menudir}/%{name}
%{_miconsdir}/*.png
%{_iconsdir}/*.png
%{_liconsdir}/*.png
%{_datadir}/%{name}/pixmaps/*.png
%_sysconfdir/X11/xinit.d/mdkapplet
-#%{_datadir}/autostart/*
##################################################################
#
@@ -130,7 +113,9 @@ rm -rf $RPM_BUILD_ROOT
# get the source from our cvs repository (see
# http://www.linuxmandrake.com/en/cvs.php3)
%changelog
-* Fri Oct 29 2004 Daouda LO <daouda@mandrakesoft.com> 1.1-20mdk
+* Wed Nov 3 2004 Daouda LO <daouda@mandrakesoft.com> 1.1-20mdk
+- remerge mdkonline to one package
+- superseded gtk based wizard by interactive one
- MNF support (config upload and misc)
- horodate log strings
- added a debug option to mdkapplet (--debug option)