summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-03-06 11:52:21 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-03-06 11:52:21 +0000
commitffafdf736a732e4882465087a5539ebdbbf13b92 (patch)
treef9bef6d0cb38f422f41f7486e7ed084c2496a262
parente2bbecbb9c1af17dfd8b9a1dfd8e5276a1cadd34 (diff)
downloaddrakx-ffafdf736a732e4882465087a5539ebdbbf13b92.tar
drakx-ffafdf736a732e4882465087a5539ebdbbf13b92.tar.gz
drakx-ffafdf736a732e4882465087a5539ebdbbf13b92.tar.bz2
drakx-ffafdf736a732e4882465087a5539ebdbbf13b92.tar.xz
drakx-ffafdf736a732e4882465087a5539ebdbbf13b92.zip
move ugtk2 back in drakxtools on gc idea
-rw-r--r--perl-install/Makefile2
-rw-r--r--perl-install/drakxtools.spec2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 9aea2d732..71b442e77 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -216,7 +216,7 @@ spec_test:
tar:
cd ../$(PACKAGE)-$(PKGVERSION) && perl -pi -e 's/^C_RPM.*/C_RPM=0/; s/^C_DRAKX.*/C_DRAKX=0/' c/Makefile
cd ../$(PACKAGE)-$(PKGVERSION) && perl -pi -e 's/^all: help/all:/' share/po/Makefile
- cd ../$(PACKAGE)-$(PKGVERSION) && rm -rf install* pkgs.pm help.pm ftp.pm http.pm crypto.pm ugtk2.pm t.pm debug.log `find -name CVS`
+ cd ../$(PACKAGE)-$(PKGVERSION) && rm -rf install* pkgs.pm help.pm ftp.pm http.pm crypto.pm t.pm debug.log `find -name CVS`
cd ../$(PACKAGE)-$(PKGVERSION) && mv -f Makefile.drakxtools Makefile
cd ../$(PACKAGE)-$(PKGVERSION) && rm -f list_modules.pm && cp -f ../kernel/list_modules.pm .
cd ..; tar cfj $(PACKAGE)-$(PKGVERSION).tar.bz2 $(patsubst %,$(PACKAGE)-$(PKGVERSION)/%,$(DISTFILES))
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index 7e9702455..aaf268ebc 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -8,7 +8,7 @@ License: GPL
Group: System/Configuration/Other
# Temporary requires for tools that still use gtk+1 (mainly drakfloppy and net_monitor)
Requires: perl-GTK >= 0.6123, perl-GTK-GdkImlib, perl-GTK-GdkPixbuf
-Requires: %{name}-newt = %version-%release, perl-GTK2 >= 0.0.cvs.2003.03.04.1-1mdk, XFree86-100dpi-fonts, XFree86-75dpi-fonts, /usr/X11R6/bin/xtest, font-tools, usermode >= 1.44-4mdk, perl-MDK-Common >= 1.0.4-14mdk, font-tools
+Requires: %{name}-newt = %version-%release, perl-GTK2 >= 0.0.cvs.2003.03.04.1-2mdk, XFree86-100dpi-fonts, XFree86-75dpi-fonts, /usr/X11R6/bin/xtest, font-tools, usermode >= 1.44-4mdk, perl-MDK-Common >= 1.0.4-14mdk, font-tools
Conflicts: drakconf < 9.1-3mdk
BuildRequires: gettext, libgtk+-x11-2.0-devel, ldetect-devel >= 0.4.8, ncurses-devel, newt-devel, perl-devel, libext2fs-devel, perl-MDK-Common-devel
BuildRoot: %_tmppath/%name-buildroot