summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenaud Chaillat <rchaillat@mandriva.com>2001-08-31 13:07:57 +0000
committerRenaud Chaillat <rchaillat@mandriva.com>2001-08-31 13:07:57 +0000
commit697c6f02e28cfab507f3e0210188a56d14a1ecb6 (patch)
tree9442dc0778d9a39df3bf644b365c7560dd927e60
parentccbe539209df7c35ce55875d2cb7c97eb5b91000 (diff)
downloadmgaonline-697c6f02e28cfab507f3e0210188a56d14a1ecb6.tar
mgaonline-697c6f02e28cfab507f3e0210188a56d14a1ecb6.tar.gz
mgaonline-697c6f02e28cfab507f3e0210188a56d14a1ecb6.tar.bz2
mgaonline-697c6f02e28cfab507f3e0210188a56d14a1ecb6.tar.xz
mgaonline-697c6f02e28cfab507f3e0210188a56d14a1ecb6.zip
changed the paths order to look for scripts
-rw-r--r--Makefile7
-rwxr-xr-xmdkonline4
-rw-r--r--mdkonline.spec14
3 files changed, 17 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 3f1b0668..ad0124be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
VERSION = $(shell awk '/define version/ { print $$3 }' $(NAME).spec)
NAME = mdkonline
+SCRIPTS = sshlogin.exp scpcall.exp
SUBDIRS = po
localedir = $(prefix)/usr/share/locale
RPM=$(HOME)/RPM
@@ -16,15 +17,17 @@ clean:
install: all
$(MAKE) -C po $@
- install -d $(RPM_BUILD_ROOT)/usr/{X11R6/bin/,share/icons,share/mdkonline/pixmaps}
+ install -d $(RPM_BUILD_ROOT)/usr/{X11R6/bin/,bin,share/icons,share/mdkonline/pixmaps}
install -s -m755 $(NAME) $(RPM_BUILD_ROOT)/usr/X11R6/bin/
+ install -s -m755 $(SCRIPTS) $(RPM_BUILD_ROOT)/usr/bin/
# install -m644 icons/*.png $(RPM_BUILD_ROOT)/usr/share/icons/
install -m644 pixmaps/*.png $(RPM_BUILD_ROOT)/usr/share/mdkonline/pixmaps
+ install -m644 privacy.txt $(RPM_BUILD_ROOT)/usr/share/mdkonline/
for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
dis: clean
rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar*
- cvs commit
+# cvs commit
mkdir -p $(NAME)-$(VERSION)
find . -not -name "$(NAME)-$(VERSION)"|cpio -pd $(NAME)-$(VERSION)/
find $(NAME)-$(VERSION) -type d -name CVS -o -name .cvsignore |xargs rm -rf
diff --git a/mdkonline b/mdkonline
index f84316d7..b149f184 100755
--- a/mdkonline
+++ b/mdkonline
@@ -188,7 +188,7 @@ sub test_passwd () {
# print STDERR "Login: $login\n";
my $ssh_script = "";
- foreach ("./sshlogin.exp", "/usr/bin/sshlogin.exp") {
+ foreach ("/usr/bin/sshlogin.exp","./sshlogin.exp") {
[ -e "$_" ] and $ssh_script="$_", last;
}
# print "Exec: $ssh_script $login $authentication_host $passwd \n";
@@ -213,7 +213,7 @@ sub send_config {
`/usr/sbin/drakbug_report > /root/drakbug_report.log`;
my $scp_script = "";
- foreach ("./scpcall.exp", "/usr/bin/scpcall.exp") {
+ foreach ("/usr/bin/scpcall.exp","./scpcall.exp") {
[ -e "$_" ] and $scp_script="$_", last;
}
# print "Exec: $scp_script /root/drakbug_report.log $login $authentication_host $passwd \n";
diff --git a/mdkonline.spec b/mdkonline.spec
index c61316aa..fd116f43 100644
--- a/mdkonline.spec
+++ b/mdkonline.spec
@@ -14,14 +14,18 @@ Source0: %{name}-%{version}.tar.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,
+Requires: drakxtools >= 1.1.5-97mdk, gtk+mdk, perl-GTK, perl-GTK-GdkImlib, usermode
Requires: popt >= 1.6,
+Requires: expect
+Requires: openssh-clients
BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildArchitectures: noarch
%description
-The Mandrake Online tool is designed for registered users who want to upload their
-configurattion (packages, hardware infos). This allow them to be kept informed about
-security updates, hardware support/enhancements and other high value services.
+The Mandrake Online tool is designed for registered users
+who want to upload their configurattion (packages, hardware infos).
+This allows them to be kept informed about security updates,
+hardware support/enhancements and other high value services.
%prep
%setup -q
@@ -65,6 +69,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root)
+%{_prefix}/bin/*
%{_prefix}/X11R6/bin/*
%{_datadir}/%{name}
%{_menudir}/%{name}
@@ -76,6 +81,7 @@ rm -rf $RPM_BUILD_ROOT
* Fri Aug 31 2001 Renaud Chaillat <rchaillat@mandrakesoft.com> 0.15-2mdk
- added ssh/scp backend with expect scripts
- improved ui
+- updated requirements
* Mon Aug 27 2001 Daouda LO <daouda@mandrakesoft.com> 0.15-1mdk
- First mandrake package