packages: libproxy/libproxy.spec, libproxy/libproxy-pac-modules.patch (NEW)...

qboosh qboosh at pld-linux.org
Mon Nov 15 22:16:30 CET 2010 

Author: qboosh                       Date: Mon Nov 15 21:16:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.4.6 (C++ rewrite using cmake)
- static library is gone
- dbus,as-needed patches obsolete; two new needed: pac-modules and pythondir
- added kde bcond
- added dotnet, perl and vala bindings

---- Files affected:
packages/libproxy:
   libproxy.spec (1.10 -> 1.11) , libproxy-pac-modules.patch (NONE -> 1.1)  (NEW), libproxy-pythondir.patch (NONE -> 1.1)  (NEW), libproxy-asneeded.patch (1.1 -> NONE)  (REMOVED), libproxy-dbus.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/libproxy/libproxy.spec
diff -u packages/libproxy/libproxy.spec:1.10 packages/libproxy/libproxy.spec:1.11
--- packages/libproxy/libproxy.spec:1.10	Fri Oct 15 03:12:43 2010
+++ packages/libproxy/libproxy.spec	Mon Nov 15 22:16:24 2010
@@ -1,32 +1,40 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	webkit	    # WebKit plugin
-%bcond_without	xulrunner   # xulrunner plugin
+%bcond_without	kde		# KDE4 plugin
+%bcond_without	webkit		# WebKit plugin
+%bcond_without	xulrunner	# xulrunner plugin
 #
+%include	/usr/lib/rpm/macros.perl
+%include	/usr/lib/rpm/macros.mono
 Summary:	Library for automatic proxy configuration management
 Summary(pl.UTF-8):	Biblioteka do automatycznego zarządzania konfiguracją proxy
 Name:		libproxy
-Version:	0.2.3
-Release:	6
-License:	LGPL v2
+Version:	0.4.6
+Release:	1
+License:	LGPL v2.1+
 Group:		Libraries
 #Source0Download: http://code.google.com/p/libproxy/downloads/list
 Source0:	http://libproxy.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	86b635e1eb2d665cfbef4c6134fe6604
-Patch0:		%{name}-dbus.patch
-Patch1:		%{name}-asneeded.patch
+# Source0-md5:	199c6b120baf1f7258a55f38d5ec74f5
+Patch0:		%{name}-pac-modules.patch
+Patch1:		%{name}-pythondir.patch
 URL:		http://code.google.com/p/libproxy/
 BuildRequires:	GConf2-devel >= 2.0
 BuildRequires:	NetworkManager-devel
-BuildRequires:	autoconf >= 2.61
-BuildRequires:	automake
+BuildRequires:	cmake >= 2.6
 %{?with_webkit:BuildRequires:	gtk-webkit-devel}
-BuildRequires:	libtool
+%{?with_kde:BuildRequires:	kde4-kdelibs-devel}
+BuildRequires:	libstdc++-devel
+BuildRequires:	mono-csharp
+BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	python-modules
+BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(monoautodeps)
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXmu-devel
 %{?with_xulrunner:BuildRequires:	xulrunner-devel}
@@ -43,6 +51,8 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libproxy
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	libstdc++-devel
+Obsoletes:	libproxy-static
 
 %description devel
 Header files for libproxy library.
@@ -50,17 +60,41 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki libproxy.
 
-%package static
-Summary:	Static libproxy library
-Summary(pl.UTF-8):	Statyczna biblioteka libproxy
+%package -n dotnet-libproxy-sharp
+Summary:	Libproxy# - libproxy .NET bindings
+Summary(pl.UTF-8):	Libproxy# - wiązania libproxy dla .NET
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description -n dotnet-libproxy-sharp
+Libproxy# - libproxy .NET bindings.
+
+%description -n dotnet-libproxy-sharp -l pl.UTF-8
+Libproxy# - wiązania libproxy dla .NET.
+
+%package -n dotnet-libproxy-sharp-devel
+Summary:	libproxy .NET bindings - development files
+Summary(pl.UTF-8):	Wiązania libproxy dla .NET - pliki programistyczne
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
+Requires:	dotnet-libproxy-sharp = %{version}-%{release}
 
-%description static
-Static libproxy library.
+%description -n dotnet-libproxy-sharp-devel
+Development files for libproxy .NET bindings.
 
-%description static -l pl.UTF-8
-Statyczna biblioteka libproxy.
+%description -n dotnet-libproxy-sharp-devel -l pl.UTF-8
+Pliki programistyczne wiązań libproxy dla .NET.
+
+%package -n perl-Net-Libproxy
+Summary:	libproxy Perl bindings
+Summary(pl.UTF-8):	Wiązania libproxy dla Perla
+Group:		Development/Languages/Perl
+Requires:	%{name} = %{version}-%{release}
+
+%description -n perl-Net-Libproxy
+libproxy Perl bindings.
+
+%description -n perl-Net-Libproxy -l pl.UTF-8
+Wiązania libproxy dla Perla.
 
 %package -n python-libproxy
 Summary:	libproxy Python bindings
@@ -75,6 +109,18 @@
 %description -n python-libproxy -l pl.UTF-8
 Wiązania libproxy dla Pythona.
 
+%package -n vala-libproxy
+Summary:	Vala bindings for libproxy API
+Summary(pl.UTF-8):	Wiązania API libproxy dla języka Vala
+Group:		Development/Languages
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description -n vala-libproxy
+Vala bindings for libproxy API.
+
+%description -n vala-libproxy -l pl.UTF-8
+Wiązania API libproxy dla języka Vala.
+
 %package networkmanager
 Summary:	NetworkManager plugin for libproxy
 Summary(pl.UTF-8):	Wtyczka NetworkManager dla libproxy
@@ -141,19 +187,30 @@
 %patch1 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure \
-	%{!?with_webkit:--without-webkit} \
-	%{!?with_xulrunner:--without-xulrunner}
+install -d build
+cd build
+%cmake .. \
+	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
+	-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	-DLIB_INSTALL_DIR=%{_libdir} \
+	-DLIBEXEC_INSTALL_DIR=%{_libdir}/libproxy \
+%if "%{_lib}" == "lib64"
+	-DLIB_SUFFIX=64 \
+%endif
+	-DPERL_VENDORINSTALL=ON \
+	-DWITH_DOTNET=ON \
+	%{!?with_xulrunner:-DWITH_MOZJS=OFF} \
+	-DWITH_VALA=ON \
+	%{!?with_webkit:-DWITH_WEBKIT=OFF}
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
@@ -168,53 +225,73 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/proxy
+%attr(755,root,root) %{_libdir}/libmodman.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmodman.so.1
 %attr(755,root,root) %{_libdir}/libproxy.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libproxy.so.0
+%attr(755,root,root) %ghost %{_libdir}/libproxy.so.1
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/%{version}
-%dir %{_libdir}/%{name}/%{version}/plugins
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/envvar.so
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/file.so
+%attr(755,root,root) %{_libdir}/%{name}/pxgconf
+%dir %{_libdir}/%{name}/%{version}/modules
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libmodman.so
 %attr(755,root,root) %{_libdir}/libproxy.so
-%{_libdir}/libproxy.la
 %{_includedir}/proxy.h
 %{_pkgconfigdir}/libproxy-1.0.pc
+%{_datadir}/cmake/Modules/Findlibproxy.cmake
+
+%files -n dotnet-libproxy-sharp
+%defattr(644,root,root,755)
+%{_prefix}/lib/mono/gac/libproxy-sharp
+%{_prefix}/lib/mono/libproxy-sharp
 
-%files static
+%files -n dotnet-libproxy-sharp-devel
 %defattr(644,root,root,755)
-%{_libdir}/libproxy.a
+%{_prefix}/lib/mono/libproxy-sharp
+%{_pkgconfigdir}/libproxy-sharp-1.0.pc
+
+%files -n perl-Net-Libproxy
+%defattr(644,root,root,755)
+%{perl_vendorarch}/Net/Libproxy.pm
+%dir %{perl_vendorarch}/auto/Net/Libproxy
+%attr(755,root,root) %{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so
 
 %files -n python-libproxy
 %defattr(644,root,root,755)
 %{py_sitescriptdir}/libproxy.py[co]
 
+%files -n vala-libproxy
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/libproxy-1.0.vapi
+
 %files networkmanager
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/networkmanager.so
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/network_networkmanager.so
 
 %files gnome
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/gnome.so
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/config_gnome.so
 
+%if %{with kde}
 %files kde
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/kde.so
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/config_kde4.so
+%endif
 
 %if %{with xulrunner}
 %files mozjs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/mozjs.so
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so
 %endif
 
 %if %{with webkit}
 %files webkit
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/webkit.so
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -223,6 +300,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/11/15 21:16:24  qboosh
+- updated to 0.4.6 (C++ rewrite using cmake)
+- static library is gone
+- dbus,as-needed patches obsolete; two new needed: pac-modules and pythondir
+- added kde bcond
+- added dotnet, perl and vala bindings
+
 Revision 1.10  2010/10/15 01:12:43  wrobell
 - added xulrunner conditional build
 

================================================================
Index: packages/libproxy/libproxy-pac-modules.patch
diff -u /dev/null packages/libproxy/libproxy-pac-modules.patch:1.1
--- /dev/null	Mon Nov 15 22:16:30 2010
+++ packages/libproxy/libproxy-pac-modules.patch	Mon Nov 15 22:16:24 2010
@@ -0,0 +1,15 @@
+Always build pacrunners as separate modules, not libproxy builtins
+--- libproxy-0.4.6/libproxy/cmake/modules.cmk.orig	2010-09-01 22:23:34.000000000 +0200
++++ libproxy-0.4.6/libproxy/cmake/modules.cmk	2010-11-15 08:54:24.659099937 +0100
+@@ -17,10 +17,7 @@
+ include(cmake/modules/pacrunner_webkit.cmk)
+ 
+ # Build the pacrunner into libproxy unless we are building for multiple engines
+-set(BIPR 1)
+-if(MOZJS_FOUND AND WEBKIT_FOUND)
+-  set(BIPR 0)
+-endif()
++set(BIPR 0)
+ 
+ #
+ ## Module definition

================================================================
Index: packages/libproxy/libproxy-pythondir.patch
diff -u /dev/null packages/libproxy/libproxy-pythondir.patch:1.1
--- /dev/null	Mon Nov 15 22:16:30 2010
+++ packages/libproxy/libproxy-pythondir.patch	Mon Nov 15 22:16:24 2010
@@ -0,0 +1,18 @@
+--- libproxy-0.4.6/bindings/python/CMakeLists.txt.orig	2010-09-01 22:23:34.000000000 +0200
++++ libproxy-0.4.6/bindings/python/CMakeLists.txt	2010-11-15 21:16:27.219102452 +0100
+@@ -18,15 +18,11 @@
+       set(libdir "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
+     endif()
+ 
+-    if (IS_DIRECTORY "${libdir}/python${PYTHON_VERSION}/site-packages")
+-      set(PYTHON_SITEPKG_DIR "${libdir}/python${PYTHON_VERSION}/site-packages")
+-    else()
+       execute_process(COMMAND
+ 		      ${PYTHON_EXECUTABLE}
+ 		      -c "import distutils.sysconfig ; print distutils.sysconfig.get_python_lib(plat_specific=0)"
+ 		      OUTPUT_VARIABLE PYTHON_SITEPKG_DIR
+ 		      OUTPUT_STRIP_TRAILING_WHITESPACE)
+-    endif()
+   endif()
+   
+   message(STATUS "Using PYTHON_SITEPKG_DIR=${PYTHON_SITEPKG_DIR}")
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libproxy/libproxy.spec?r1=1.10&r2=1.11&f=u

More information about the pld-cvs-commit mailing list