summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRex Dieter <rdieter@fedoraproject.org>2012-08-14 17:40:19 (GMT)
committerRex Dieter <rdieter@fedoraproject.org>2012-08-14 17:40:19 (GMT)
commitfa4c7bedcae002dc4e8b7e55afc7e9439432dd7a (patch)
treed7f499348b457e45fa68f7f1b19f55083da427b2
parent93c468fb7f2253f237e9e50858177a259d521580 (diff)
downloadlibmatecomponent-fa4c7bedcae002dc4e8b7e55afc7e9439432dd7a.zip
libmatecomponent-fa4c7bedcae002dc4e8b7e55afc7e9439432dd7a.tar.gz
libmatecomponent-fa4c7bedcae002dc4e8b7e55afc7e9439432dd7a.tar.xz
drop needless -libs subpkg
-rw-r--r--libmatecomponent.spec45
1 files changed, 21 insertions, 24 deletions
diff --git a/libmatecomponent.spec b/libmatecomponent.spec
index 2c363c5..e650b46 100644
--- a/libmatecomponent.spec
+++ b/libmatecomponent.spec
@@ -1,32 +1,29 @@
Name: libmatecomponent
Version: 1.4.0
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Libraries for matecomponent package of MATE-Desktop
License: LGPLv2+ and GPLv2+
URL: http://mate-desktop.org
Source0: http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
BuildRequires: byacc flex libxml2-devel mate-common mate-corba-devel popt-devel
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Provides: libmatecomponent-activation%{?_isa} = %{version}-%{release}
Provides: libmatecomponent-activation = %{version}-%{release}
Patch0: libmatecomponent-multishlib.patch
+# momentary lapse of reason introducing a -libs subpkg here, sorry -- rex
+Obsoletes: libmatecomponent-libs < 1.4.0-13
+Provides: libmatecomponent-libs = %{version]-%{release}
+Provides: libmatecomponent-libs%{?_isa} = %{version]-%{release}
+
%description
Libraries for matecomponent package of MATE-Desktop
-%package libs
-Summary: Shared libraries for libmatecomponent
-Requires: %{name} = %{version}-%{release}
-
-%description libs
-Shared libraries for libmatecomponent
-
%package devel
Summary: Development libraries for libmatecomponent
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Provides: libmatecomponent-activation-devel%{?_isa} = %{version}-%{release}
Provides: libmatecomponent-activation-devel = %{version}-%{release}
@@ -48,18 +45,18 @@ make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name '*.a' -exec rm -f {} ';'
-for serverfile in $RPM_BUILD_ROOT%{_libdir}/matecomponent/servers/*.server; do
+for serverfile in %{buildroot}%{_libdir}/matecomponent/servers/*.server; do
sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
done
#required for multilib installs /usr/lib/matecomponent/servers
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/matecomponent/servers
+mkdir -p %{buildroot}%{_prefix}/lib/matecomponent/servers
%find_lang %{name}
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files -f %{name}.lang
%doc AUTHORS COPYING README
@@ -73,6 +70,13 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/matecomponent/servers
%{_datadir}/man/man1/*
%{_datadir}/idl/matecomponent-2.0/
%{_datadir}/idl/matecomponent-activation-2.0/
+%{_libdir}/libmatecomponent-2.so.0*
+%{_libdir}/libmatecomponent-activation.so.4*
+%{_libdir}/matecomponent-2.0/
+%{_libdir}/matecomponent/
+%dir %{_prefix}/lib/matecomponent/
+%dir %{_prefix}/lib/matecomponent/servers/
+%{_libdir}/matecorba-2.0/MateComponent_module.so
%files devel
%{_libdir}/libmatecomponent-2.so
@@ -84,18 +88,11 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/matecomponent/servers
%{_datadir}/gtk-doc/html/libmatecomponent/
%{_datadir}/gtk-doc/html/matecomponent-activation/
-%files libs
-%{_libdir}/libmatecomponent-2.so.0*
-%{_libdir}/libmatecomponent-activation.so.4*
-# consider moving these to main package, but may well be needed here
-# for proper function on multilib systems -- rex
-%{_libdir}/matecomponent-2.0/
-%{_libdir}/matecomponent/
-%dir %{_prefix}/lib/matecomponent/
-%dir %{_prefix}/lib/matecomponent/servers/
-%{_libdir}/matecorba-2.0/MateComponent_module.so
%changelog
+* Tue Aug 14 2012 Rex Dieter <rdieter@fedoraproject.org> 1.4.0-13
+- drop needless -libs subpkg
+
* Tue Aug 14 2012 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.4.0-12
- fix provides