- updated to 0.13

- added bcond to build libproxy dropin

diff --git a/pacrunner.spec b/pacrunner.spec
index 52b166889b02b217ffd8e7548c10f722fb956a86..646f8f90738174735879a6d4e1818674acc63940 100644 (file)
--- a/pacrunner.spec
+++ b/pacrunner.spec
@@ -2,16 +2,17 @@
 # Conditional build:
 %bcond_with    mozjs           # use Mozilla JavaScript
 %bcond_with    v8              # use Chrome V8 JavaScript
+%bcond_with    libproxy        # build libproxy compatible library
 #
 Summary:       PACrunner - Proxy configuration daemon
 Summary(pl.UTF-8):     PACrunner - demon do konfiguracji proxy
 Name:          pacrunner
-Version:       0.11
+Version:       0.13
 Release:       1
 License:       GPL v2
 Group:         Applications/Networking
 Source0:       https://www.kernel.org/pub/linux/network/connman/%{name}-%{version}.tar.xz
-# Source0-md5: e6bcb6a2b26481a34d74357913b0ad71
+# Source0-md5: c0aec86264338cba5721c63f607ee2b3
 # pacrunner.org is dead
 URL:           http://www.ohloh.net/p/pacrunner
 BuildRequires: curl-devel >= 7.16
@@ -35,6 +36,32 @@ providing information to clients over D-Bus.
 PACrunner zawiera demona do przetwarzania konfiguracji proxy i
 udostępniania informacji klientom poprzez D-Bus.
 
+%package libproxy
+Summary:       PACrunner based proxy configuration library
+Summary(pl.UTF-8):     Biblioteka do konfiguracji proxy oparta na PACrunnerze
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description libproxy
+PACrunner based proxy configuration library (compatible with
+libproxy).
+
+%description libproxy -l pl.UTF-8
+Biblioteka do konfiguracji proxy oparta na PACrunnerze (zgodna z
+libproxy).
+
+%package libproxy-devel
+Summary:       Header file for PACrunner libproxy library
+Summary(pl.UTF-8):     Plik nagłówkowy biblioteki PACrunnera libproxy
+Group:         Development/Libraries
+Requires:      %{name}-libproxy = %{version}-%{release}
+
+%description libproxy-devel
+Header file for PACrunner libproxy library.
+
+%description libproxy-devel -l pl.UTF-8
+Plik nagłówkowy biblioteki PACrunnera libproxy.
+
 %prep
 %setup -q
 
@@ -43,6 +70,7 @@ udostępniania informacji klientom poprzez D-Bus.
        --disable-silent-rules \
        --enable-curl \
        --enable-duktape \
+       %{?with_libproxy:--enable-libproxy} \
        %{?with_mozjs:--enable-mozjs} \
        %{?with_v8:--enable-v8}
 %{__make}
@@ -53,12 +81,34 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%if %{with libproxy}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libproxy.la
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  libproxy -p /sbin/ldconfig
+%postun        libproxy -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO doc/*.txt
 %attr(755,root,root) %{_sbindir}/pacrunner
 /etc/dbus-1/system.d/pacrunner.conf
-/usr/share/dbus-1/system-services/pacrunner.service
+/usr/share/dbus-1/system-services/org.pacrunner.service
+
+%if %{with libproxy}
+%files libproxy
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/manual-proxy-test
+%attr(755,root,root) %{_bindir}/proxy
+%attr(755,root,root) %{_libdir}/libproxy.so.1.0.0
+%attr(755,root,root) %ghost %{_libdir}/libproxy.so.1
+
+%files libproxy-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libproxy.so
+%{_includedir}/proxy.h
+%{_pkgconfigdir}/libproxy-1.0.pc
+%endif