rpms/libproxy/F-13 libproxy-0.3.1-kde4.patch, NONE, 1.1 libproxy.spec, 1.10, 1.11

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/pkgs/rpms/libproxy/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11339

Modified Files:
	libproxy.spec 
Added Files:
	libproxy-0.3.1-kde4.patch 
Log Message:
- Globalism and update gecko to 1.9.2
- Avoid rpath on _libdir
- Fix BR for kde4 to kdelibs-devel


libproxy-0.3.1-kde4.patch:
 configure.ac |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE libproxy-0.3.1-kde4.patch ---
diff -up libproxy-0.3.1/configure.ac.kde4 libproxy-0.3.1/configure.ac
--- libproxy-0.3.1/configure.ac.kde4	2009-10-05 20:42:34.000000000 +0200
+++ libproxy-0.3.1/configure.ac	2010-02-22 00:12:30.690720150 +0100
@@ -23,8 +23,6 @@ AC_CHECK_FUNCS(pthread_mutex_init)
 AC_SEARCH_LIBS([socket],[socket inet])
 AC_SEARCH_LIBS([dlopen],[dl])
 
-AC_CHECK_LIB([kdecore], [main], have_kdecore=yes, have_kdecore=no)
-
 ### Checks for module dependencies.
 AC_PATH_PROG(GCONFTOOLBIN, gconftool-2)
 PKG_CHECK_MODULES(x11, x11, have_x11=yes, have_x11=no)
@@ -38,6 +36,8 @@ PKG_CHECK_MODULES(NetworkManager, Networ
 					have_networkmanager=yes, have_networkmanager=no)
 PKG_CHECK_MODULES(QtCore, QtCore, have_qtcore=yes, have_qtcore=no)
 
+AC_CHECK_LIB([kdecore], [main], have_kdecore=yes, have_kdecore=yes)
+
 # Direct
 AC_ARG_WITH([direct],
             [AS_HELP_STRING([--with-direct],
@@ -96,8 +96,8 @@ AC_ARG_WITH([kde4],
 if test x$with_kde4 = xyes; then
 	if test x$have_qtcore  = xyes && \
 	   test x$have_kdecore = xyes; then
-		KDE4_CFLAGS="$QtCore_CFLAGS"
-		KDE4_LIBS="$QtCore_LIBS -lkdecore"
+		KDE4_CFLAGS="$KDE4_CFLAGS $QtCore_CFLAGS"
+		KDE4_LIBS="$KDE4_LIBS -lkdecore $QtCore_LIBS"
 		AC_SUBST(KDE4_CFLAGS)
 		AC_SUBST(KDE4_LIBS)
 	else


Index: libproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/F-13/libproxy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libproxy.spec	28 Dec 2009 15:45:38 -0000	1.10
+++ libproxy.spec	21 Feb 2010 23:34:11 -0000	1.11
@@ -1,32 +1,33 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define gecko_version 1.9.1
+%global gecko_version 1.9.2
 
 Name:           libproxy
 Version:        0.3.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A library handling all the details of proxy configuration
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://code.google.com/p/libproxy/
 Source0:        http://libproxy.googlecode.com/files/libproxy-%{version}.tar.bz2
+Patch0:         libproxy-0.3.1-kde4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
+BuildRequires:  libtool
 
 # gnome
 BuildRequires:  GConf2-devel
 # mozjs
-BuildRequires:  gecko-devel >= %{gecko_version}
+BuildRequires:  gecko-devel
 # NetworkManager
 BuildRequires:  NetworkManager-devel
 BuildRequires:  dbus-devel
 # webkit (gtk)
 BuildRequires:  WebKit-gtk-devel
 # kde
-BuildRequires:  libXmu-devel
-BuildRequires:  libX11-devel
+BuildRequires:  kdelibs-devel
 
 
 %description
@@ -115,10 +116,17 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .kde4
+#To avoid rpath on _libdir
+autoreconf -vif
 
 
 %build
+#needed to find kde4 libs
+KDE4_LIBS=" -L%{_libdir}/kde4/devel"
+KDE4_CFLAGS=" -I%{_includedir}/kde4"
+export KDE4_LIBS
+export KDE4_CFLAGS
 %configure --includedir=%{_includedir}/libproxy --disable-static --with-python
 make %{?_smp_mflags}
 
@@ -168,7 +176,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files kde
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/%{version}/modules/config_kde.so
+%{_libdir}/%{name}/%{version}/modules/config_kde4.so
 
 %files mozjs
 %defattr(-,root,root,-)
@@ -190,6 +198,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 21 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 0.3.1-4
+- Globalism and update gecko to 1.9.2
+- Avoid rpath on _libdir
+- Fix BR for kde4 to kdelibs-devel
+
 * Sun Dec 27 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 0.3.1-1
 - Update to 0.3.1
 - Avoid dependecies on -python and -bin subpackages