From 7b5df6c0a9539f3cb575905ae7c9a0c77e56f7a5 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 21 Feb 2010 23:27:51 +0000 Subject: [PATCH] Update spec file along --- libproxy.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/libproxy.spec b/libproxy.spec index 20db373..7dbb7ac 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -4,13 +4,14 @@ Name: libproxy Version: 0.3.1 -Release: 3%{?dist} +Release: 3%{?dist}.1 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 @@ -26,7 +27,7 @@ BuildRequires: dbus-devel # webkit (gtk) BuildRequires: WebKit-gtk-devel # kde -BuildRequires: kdebase-devel +BuildRequires: kdelibs-devel %description @@ -115,11 +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} @@ -169,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,-) @@ -191,10 +198,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sun Feb 21 2010 Nicolas Chauvet - 0.3.1-3 +* Sun Feb 21 2010 Nicolas Chauvet - 0.3.1-4 - Globalism and update gecko to 1.9.2 - Avoid rpath on _libdir -- Fix BR for kde4 to kdebase-devel +- Fix BR for kde4 to kdelibs-devel * Sun Dec 27 2009 Nicolas Chauvet - 0.3.1-1 - Update to 0.3.1