- Fix mozjs/webkit obsoletion - rhbz#656849

- Workaround unreliable Version field in pkg-config - rhbz#656484
This commit is contained in:
kwizart 2010-11-24 12:02:09 +01:00
parent 0bd2b8666d
commit ceb3a49042

View File

@ -15,7 +15,7 @@
Name: libproxy Name: libproxy
Version: 0.4.6 Version: 0.4.6
Release: 1%{?dist} Release: 2%{?dist}
Summary: A library handling all the details of proxy configuration Summary: A library handling all the details of proxy configuration
Group: System Environment/Libraries Group: System Environment/Libraries
@ -46,6 +46,16 @@ BuildRequires: dbus-devel
# kde # kde
%{?_with_kde:BuildRequires: kdelibs-devel} %{?_with_kde:BuildRequires: kdelibs-devel}
#Obsoletes of disabled subpackages
%{!?_with_mozjs:
Provides: %{name}-mozjs = %{version}-101
Obsoletes: %{name}-mozjs < %{version}-101
}
%{!?_with_webkit:
Provides: %{name}-webkit = %{version}-101
Obsoletes: %{name}-webkit < %{version}-101
}
%description %description
libproxy offers the following features: libproxy offers the following features:
@ -148,6 +158,10 @@ developing applications that use %{name}.
%setup -q %setup -q
%patch0 -p1 -b.pynoarch %patch0 -p1 -b.pynoarch
#Fix version field in pkg-config
sed -i -e 's|@PROJECT_VERSION@|%{version}|' libproxy/libproxy-1.0.pc.in
%build %build
%{cmake} \ %{cmake} \
-DLIBEXEC_INSTALL_DIR=%{_libexecdir} \ -DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
@ -234,6 +248,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Nov 24 2010 Nicolas Chauvet <kwizart@gmail.com> - 0.4.6-2
- Fix mozjs/webkit obsoletion - rhbz#656849
- Workaround unreliable Version field in pkg-config - rhbz#656484
* Sun Nov 07 2010 Nicolas Chauvet <kwizart@gmail.com> - 0.4.6-1 * Sun Nov 07 2010 Nicolas Chauvet <kwizart@gmail.com> - 0.4.6-1
- Update to 0.4.6 - Update to 0.4.6
- Fix python module not arch dependant - Fix python module not arch dependant