OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Sep-2005 21:44:20
Branch: HEAD Handle: 2005092820442000
Added files:
openpkg-src/kde-libs kde-libs.patch
Modified files:
openpkg-src/kde-libs kde-libs.spec
Log:
upgrading package: kde-libs 3.3.1 -> 3.4.2
Summary:
Revision Changes Path
1.4 +12 -0 openpkg-src/kde-libs/kde-libs.patch
1.17 +7 -10 openpkg-src/kde-libs/kde-libs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kde-libs/kde-libs.patch
============================================================================
$ cvs diff -u -r0 -r1.4 kde-libs.patch
--- /dev/null 2005-09-28 21:44:17 +0200
+++ kde-libs.patch 2005-09-28 21:44:20 +0200
@@ -0,0 +1,12 @@
+--- kjs/Makefile.in.orig 2005-09-28 18:00:15.027670000 +0200
++++ kjs/Makefile.in 2005-09-28 18:13:29.595755958 +0200
+@@ -669,7 +669,7 @@
+ #>+ 2
+ @[EMAIL PROTECTED]: libkjs.la.closure $(libkjs_la_OBJECTS)
$(libkjs_la_DEPENDENCIES)
+ @[EMAIL PROTECTED]: $(libkjs_la_OBJECTS) $(libkjs_la_DEPENDENCIES)
+- $(CXXLINK) -rpath $(libdir) $(libkjs_la_LDFLAGS) $(libkjs_la_OBJECTS)
$(libkjs_la_LIBADD) $(LIBS)
++ $(CXXLINK) -rpath $(libdir) $(libkjs_la_LDFLAGS) $(libkjs_la_OBJECTS)
$(libkjs_la_LIBADD) $(LIBS) -lpcre
+
+ clean-checkPROGRAMS:
+ @list='$(check_PROGRAMS)'; for p in $$list; do \
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kde-libs/kde-libs.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 kde-libs.spec
--- openpkg-src/kde-libs/kde-libs.spec 24 Mar 2005 11:19:10 -0000
1.16
+++ openpkg-src/kde-libs/kde-libs.spec 28 Sep 2005 19:44:20 -0000
1.17
@@ -23,8 +23,8 @@
##
# package version
-%define V_kde 3.3.1
-%define V_libs 3.3.1
+%define V_kde 3.4.2
+%define V_libs 3.4.2
# package information
Name: kde-libs
@@ -37,18 +37,19 @@
Group: KDE
License: GPL
Version: %{V_libs}
-Release: 20041026
+Release: 20050928
# list of sources
Source0:
ftp://ftp.kde.org/pub/kde/stable/%{V_kde}/src/kdelibs-%{V_libs}.tar.bz2
+Patch0: kde-libs.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, pkgconfig
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: X11, kde-qt >= 3.2.3-20040406, kde-arts >= 1.2.1, pcre,
openssl, libxml, libxslt, gettext
-PreReq: X11, kde-qt >= 3.2.3-20040406, kde-arts >= 1.2.1, pcre,
openssl, libxml, libxslt, gettext
+BuildPreReq: X11, kde-qt >= 3.2.3-20040406, kde-arts >= 1.2.1, pcre,
openssl, libxml, libxslt, gettext, glib2
+PreReq: X11, kde-qt >= 3.2.3-20040406, kde-arts >= 1.2.1, pcre,
openssl, libxml, libxslt, gettext, glib2
AutoReq: no
AutoReqProv: no
@@ -71,17 +72,13 @@
%prep
%setup -q -n kdelibs-%{V_libs}
+ %patch -p0
# GCC 3.3 with -pedantic is too restrictive for most vendor system
headers.
%{l_shtool} subst \
-e 's;-pedantic;;' \
configure
- # redirect back datadir based locations
- %{l_shtool} subst -s \
- -e 's;${prefix}/share/;${datadir};' \
- `find . -name Makefile.in -type f -print`
-
# make sure KDE does search for binaries inside OpenPKG first
%{l_shtool} subst -s \
-e 's;\(kde_default_bindirs\)="[^"]*";\1="%{l_prefix}/libexec/kde
%{l_prefix}/bin /bin /sbin /usr/bin /usr/sbin";' \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
