OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Oct-2005 19:49:23
Branch: HEAD Handle: 2005103118492200
Modified files:
openpkg-src/perl-gtk perl-gtk.spec
Log:
the ExtUtils:* part of perl-gtk now is in perl-module
Summary:
Revision Changes Path
1.92 +6 -26 openpkg-src/perl-gtk/perl-gtk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-gtk/perl-gtk.spec
============================================================================
$ cvs diff -u -r1.91 -r1.92 perl-gtk.spec
--- openpkg-src/perl-gtk/perl-gtk.spec 19 Oct 2005 20:39:04 -0000
1.91
+++ openpkg-src/perl-gtk/perl-gtk.spec 31 Oct 2005 18:49:22 -0000
1.92
@@ -25,8 +25,6 @@
# package versions
%define V_perl 5.8.7
%define V_gtk_perl 0.7009
-%define V_extutils_depends 0.205
-%define V_extutils_pkgconfig 1.07
%define V_cairo 0.02
%define V_glib 1.110
%define V_gtk2 1.110
@@ -42,7 +40,7 @@
Group: Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 20051019
+Release: 20051031
# package options
%option with_gtk1 yes
@@ -50,11 +48,9 @@
# list of sources
Source0:
http://www.cpan.org/modules/by-module/Gtk/Gtk-Perl-%{V_gtk_perl}.tar.gz
-Source1:
http://osdn.dl.sourceforge.net/sourceforge/gtk2-perl/ExtUtils-Depends-%{V_extutils_depends}.tar.gz
-Source2:
http://osdn.dl.sourceforge.net/sourceforge/gtk2-perl/ExtUtils-PkgConfig-%{V_extutils_pkgconfig}.tar.gz
-Source3:
http://osdn.dl.sourceforge.net/sourceforge/gtk2-perl/Cairo-%{V_cairo}.tar.gz
-Source4:
http://osdn.dl.sourceforge.net/sourceforge/gtk2-perl/Glib-%{V_glib}.tar.gz
-Source5:
http://osdn.dl.sourceforge.net/sourceforge/gtk2-perl/Gtk2-%{V_gtk2}.tar.gz
+Source1:
http://osdn.dl.sourceforge.net/sourceforge/gtk2-perl/Cairo-%{V_cairo}.tar.gz
+Source2:
http://osdn.dl.sourceforge.net/sourceforge/gtk2-perl/Glib-%{V_glib}.tar.gz
+Source3:
http://osdn.dl.sourceforge.net/sourceforge/gtk2-perl/Gtk2-%{V_gtk2}.tar.gz
# build information
Prefix: %{l_prefix}
@@ -66,8 +62,8 @@
PreReq: gtk, perl-xml
%endif
%if "%{with_gtk2}" == "yes"
-BuildPreReq: perl-xml >= %{V_perl}-20030920, glib2::with_threads = no,
gtk2, pango, atk, cairo
-PreReq: perl-xml >= %{V_perl}-20030920, glib2::with_threads = no,
gtk2, pango, atk, cairo
+BuildPreReq: perl-module, perl-xml >= %{V_perl}-20030920,
glib2::with_threads = no, gtk2, pango, atk, cairo
+PreReq: perl-module, perl-xml >= %{V_perl}-20030920,
glib2::with_threads = no, gtk2, pango, atk, cairo
%endif
AutoReq: no
AutoReqProv: no
@@ -78,8 +74,6 @@
- Gtk-Perl (%{V_gtk_perl}) [for GLib/Gtk+ 1.x]
%endif
%if "%{with_gtk2}" == "yes"
- - ExtUtils::Depends (%{V_extutils_depends}) [for GLib/Gtk+ 2.x]
- - ExtUtils::PkgConfig (%{V_extutils_pkgconfig}) [for GLib/Gtk+ 2.x]
- Glib (%{V_glib}) [for GLib/Gtk+ 2.x]
- Gtk2 (%{V_gtk2}) [for GLib/Gtk+ 2.x]
- Cairo (%{V_cairo}) [for GLib/Gtk+ 2.x]
@@ -91,16 +85,6 @@
url = http://www.cpan.org/modules/by-module/Gtk/
regex = Gtk-Perl-(__VER__)\.tar\.gz
}
- prog perl-gtk:Gtk2-Perl:ExtUtils-Depends = {
- version = %{V_extutils_depends}
- url = http://prdownloads.sourceforge.net/gtk2-perl/
- regex = ExtUtils-Depends-(__VER__)\.tar\.gz
- }
- prog perl-gtk:Gtk2-Perl:ExtUtils-PkgConfig = {
- version = %{V_extutils_pkgconfig}
- url = http://prdownloads.sourceforge.net/gtk2-perl/
- regex = ExtUtils-PkgConfig-(__VER__)\.tar\.gz
- }
prog perl-gtk:Gtk2-Perl:Glib = {
version = %{V_glib}
url = http://prdownloads.sourceforge.net/gtk2-perl/
@@ -122,8 +106,6 @@
%setup -q -T -D -a 1
%setup -q -T -D -a 2
%setup -q -T -D -a 3
- %setup -q -T -D -a 4
- %setup -q -T -D -a 5
%build
@@ -139,8 +121,6 @@
%{l_prefix}/bin/perl-openpkg -d %{SOURCE1} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE2} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE3} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE4} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE5} configure build install
%endif
%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat
perl-openpkg-files`
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]