SHA256
1
0
forked from pool/libproxy
OBS User unknown 2009-02-26 11:23:48 +00:00 committed by Git OBS Bridge
parent 5e1ff32e6c
commit ae3d478f51
2 changed files with 121 additions and 52 deletions

View File

@ -1,3 +1,40 @@
-------------------------------------------------------------------
Mon Feb 23 13:57:01 CET 2009 - vuntz@novell.com
- Revert the use of %{libproxy_shnum}: there are places where the
macro cannot be used (%files, eg), and we want don't want to mix
libproxy0 and libproxy%{libproxy_shnum} -- too likely to forget
to update one of the two instances.
-------------------------------------------------------------------
Sun Feb 22 02:14:14 CET 2009 - vuntz@novell.com
- Review changes.
- Add Provides/Obsoletes after plugin packages renaming.
- Don't use %{name} everywhere: in some places, it doesn't help
with clarity; in some others, it could be wrong in the future (in
Supplements).
-------------------------------------------------------------------
Tue Feb 17 11:06:18 CET 2009 - domninique-obs@leuenberger.net
- Replace the %{name}0 all over by %{name}%{libproxy_shnum}, makes
it easier for future updates by linking to variables.
-------------------------------------------------------------------
Tue Feb 17 09:55:00 CET 2009 - vuntz@novell.com
- Review changes.
-------------------------------------------------------------------
Tue Feb 17 09:49:12 CET 2009 - dominique-obs@leuenberger.net
- Have the plugin sub-packages follow the shlib name. The plugins
are depending on a specific version of the lib and should be
installable in parallel together with multiple libs.
The plugins live in a versioned directory, so no conflicts can
happen.
-------------------------------------------------------------------
Mon Feb 16 16:11:13 CET 2009 - ro@suse.de

View File

@ -23,10 +23,10 @@ Name: libproxy
Group: System/Libraries
Summary: libproxy is a library that provides automatic proxy configuration management
Version: 0.2.3
Release: 3
Release: 4
Source: http://libproxy.googlecode.com/files/%{name}-%{version}.tar.bz2
Patch0: %{name}-%{version}-dbus.diff
Patch1: %{name}-svn-277.patch
Patch0: libproxy-0.2.3-dbus.diff
Patch1: libproxy-svn-277.patch
License: LGPL v2.1 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: xorg-x11-libXmu-devel
@ -65,7 +65,7 @@ Authors:
License: GPL v2 or later; LGPL v2.1 or later
Summary: A simple application using libproxy
Group: System/Libraries
Requires: %{name}0 = %{version}
Requires: libproxy0 = %{version}
%description tools
A simple application that will use libproxy to give the results you can
@ -83,7 +83,7 @@ Authors:
License: GPL v2 or later; LGPL v2.1 or later
Summary: libproxy is a library that provides automatic proxy configuration management - development files
Group: Development/Libraries/C and C++
Requires: %{name}0 = %{version}
Requires: libproxy0 = %{version}
%description devel
libproxy offers the following features: * extremely small core
@ -105,7 +105,7 @@ Authors:
Nathaniel McCallum <nathaniel@natemccallum.com>
Alex Panait <kippled@gmail.com>
%package -n libproxy0
%package -n libproxy0
License: GPL v2 or later; LGPL v2.1 or later
Summary: libproxy is a library that provides automatic proxy configuration management
Group: System/Libraries
@ -130,14 +130,16 @@ Authors:
Nathaniel McCallum <nathaniel@natemccallum.com>
Alex Panait <kippled@gmail.com>
%package -n libproxy-gnome
%package -n libproxy0-gnome
License: GPL v2 or later; LGPL v2.1 or later
Summary: Libproxy plugin for GNOME configuration
Group: System/Libraries
Requires: %{name}0 = %{version}
Supplements: packageand(%{name}0:gconf2)
Requires: libproxy0 = %{version}
Supplements: packageand(libproxy0:gconf2)
Provides: libproxy-gnome = %{version}
Obsoletes: libproxy-gnome < %{version}
%description -n libproxy-gnome
%description -n libproxy0-gnome
A plugin to extend libproxy with capabilities to query GNOME about
proxy settings.
@ -148,14 +150,16 @@ Authors:
Nathaniel McCallum <nathaniel@natemccallum.com>
Alex Panait <kippled@gmail.com>
%package -n libproxy-kde
%package -n libproxy0-kde
License: GPL v2 or later; LGPL v2.1 or later
Summary: Libproxy plugin for KDE configuration
Group: System/Libraries
Requires: %{name}0 = %{version}
Supplements: packageand(%{name}0:libkde4)
Requires: libproxy0 = %{version}
Supplements: packageand(libproxy0:libkde4)
Provides: libproxy-kde = %{version}
Obsoletes: libproxy-kde < %{version}
%description -n libproxy-kde
%description -n libproxy0-kde
A plugin to extend libproxy with capabilities to query KDE about proxy
settings.
@ -166,14 +170,16 @@ Authors:
Nathaniel McCallum <nathaniel@natemccallum.com>
Alex Panait <kippled@gmail.com>
%package -n libproxy-mozjs
%package -n libproxy0-mozjs
License: GPL v2 or later; LGPL v2.1 or later
Summary: Libproxy plugin to support wpad/pac parsing via Mozilla JavaScript Engine
Group: System/Libraries
Requires: %{name}0 = %{version}
Supplements: packageand(%{name}0:firefox)
Requires: libproxy0 = %{version}
Supplements: packageand(libproxy0:firefox)
Provides: libproxy-mozjs = %{version}
Obsoletes: libproxy-mozjs < %{version}
%description -n libproxy-mozjs
%description -n libproxy0-mozjs
A plugin to extend libproxy with capabilities to pass addresses to a
WPAD/PAC script and have it find the correct proxy.
@ -184,14 +190,16 @@ Authors:
Nathaniel McCallum <nathaniel@natemccallum.com>
Alex Panait <kippled@gmail.com>
%package -n libproxy-webkit
%package -n libproxy0-webkit
License: GPL v2 or later; LGPL v2.1 or later
Summary: Libproxy plugin to support WPAD/PAC parsing via WebKit JavaScript Engine
Group: System/Libraries
Requires: %{name}0 = %{version}
Supplements: packageand(%{name}0:libwebkit-1)
Requires: libproxy0 = %{version}
Supplements: packageand(libproxy0:libwebkit-1)
Provides: libproxy-webkit = %{version}
Obsoletes: libproxy-webkit < %{version}
%description -n libproxy-webkit
%description -n libproxy0-webkit
A plugin to extend libproxy with capabilities to pass addresses to a
WPAD/PAC script and have it find the correct proxy.
@ -202,14 +210,16 @@ Authors:
Nathaniel McCallum <nathaniel@natemccallum.com>
Alex Panait <kippled@gmail.com>
%package -n libproxy-networkmanager
%package -n libproxy0-networkmanager
License: GPL v2 or later; LGPL v2.1 or later
Summary: Libproxy plugin for NetworkManager configuration
Group: System/Libraries
Requires: %{name}0 = %{version}
Supplements: packageand(%{name}0:NetworkManager)
Requires: libproxy0 = %{version}
Supplements: packageand(libproxy0:NetworkManager)
Provides: libproxy-networkmanager = %{version}
Obsoletes: libproxy-networkmanager < %{version}
%description -n libproxy-networkmanager
%description -n libproxy0-networkmanager
A plugin to extend libproxy with capabilities to query NetworkManager
about proxy settings.
@ -224,7 +234,7 @@ Authors:
License: GPL v2 or later; LGPL v2.1 or later
Summary: Python bindings for libproxy
Group: System/Libraries
Requires: %{name}0 = %{version}
Requires: libproxy0 = %{version}
Requires: python
%description -n python-libproxy
@ -259,56 +269,78 @@ autoreconf -f -i
%install
%makeinstall
rm $RPM_BUILD_ROOT%{_libdir}/%{name}.la
rm $RPM_BUILD_ROOT%{_libdir}/*.la
%post -n %{name}0 -p /sbin/ldconfig
%post -n libproxy0 -p /sbin/ldconfig
%postun -n %{name}0 -p /sbin/ldconfig
%postun -n libproxy0 -p /sbin/ldconfig
%files tools
%defattr(-, root, root)
%{_bindir}/proxy
%files -n %{name}0
%files -n libproxy0
%defattr(-, root, root)
%{_libdir}/%{name}.so.*
%dir %{_libdir}/%{name}/
%dir %{_libdir}/%{name}/%{version}
%dir %{_libdir}/%{name}/%{version}/plugins
%{_libdir}/%{name}/%{version}/plugins/envvar.so
%{_libdir}/%{name}/%{version}/plugins/file.so
%{_libdir}/*.so.*
%dir %{_libdir}/libproxy
%dir %{_libdir}/libproxy/%{version}
%dir %{_libdir}/libproxy/%{version}/plugins
%{_libdir}/libproxy/%{version}/plugins/envvar.so
%{_libdir}/libproxy/%{version}/plugins/file.so
%files devel
%defattr(-, root, root)
%{_includedir}/proxy.h
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}-1.0.pc
%{_includedir}/*.h
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%files -n %{name}-kde
%files -n libproxy0-kde
%defattr(-, root, root)
%{_libdir}/%{name}/%{version}/plugins/kde.so
%{_libdir}/libproxy/%{version}/plugins/kde.so
%files -n %{name}-gnome
%files -n libproxy0-gnome
%defattr(-, root, root)
%{_libdir}/%{name}/%{version}/plugins/gnome.so
%{_libdir}/libproxy/%{version}/plugins/gnome.so
%files -n %{name}-networkmanager
%files -n libproxy0-networkmanager
%defattr(-, root, root)
%{_libdir}/%{name}/%{version}/plugins/networkmanager.so
%{_libdir}/libproxy/%{version}/plugins/networkmanager.so
%files -n %{name}-webkit
%files -n libproxy0-webkit
%defattr(-, root, root)
%{_libdir}/%{name}/%{version}/plugins/webkit.so
%{_libdir}/libproxy/%{version}/plugins/webkit.so
%files -n %{name}-mozjs
%files -n libproxy0-mozjs
%defattr(-, root, root)
%{_libdir}/%{name}/%{version}/plugins/mozjs.so
%{_libdir}/libproxy/%{version}/plugins/mozjs.so
%files -n python-%{name}
%files -n python-libproxy
%defattr(-, root, root)
%{py_sitedir}/%{name}.py
%{py_sitedir}/*.py
%changelog
* Mon Feb 23 2009 vuntz@novell.com
- Revert the use of %%{libproxy_shnum}: there are places where the
macro cannot be used (%%files, eg), and we want don't want to mix
libproxy0 and libproxy%%{libproxy_shnum} -- too likely to forget
to update one of the two instances.
* Sun Feb 22 2009 vuntz@novell.com
- Review changes.
- Add Provides/Obsoletes after plugin packages renaming.
- Don't use %%{name} everywhere: in some places, it doesn't help
with clarity; in some others, it could be wrong in the future (in
Supplements).
* Tue Feb 17 2009 domninique-obs@leuenberger.net
- Replace the %%{name}0 all over by %%{name}%%{libproxy_shnum}, makes
it easier for future updates by linking to variables.
* Tue Feb 17 2009 vuntz@novell.com
- Review changes.
* Tue Feb 17 2009 dominique-obs@leuenberger.net
- Have the plugin sub-packages follow the shlib name. The plugins
are depending on a specific version of the lib and should be
installable in parallel together with multiple libs.
The plugins live in a versioned directory, so no conflicts can
happen.
* Mon Feb 16 2009 ro@suse.de
- added baselibs.conf
(libproxy0-32bit needed by libsoup-2_4-1-32bit)