[packages/cinnamon-desktop] split -libs for development

glen glen at pld-linux.org
Tue Mar 24 20:59:47 CET 2015


commit c168fce7511c225bc30f2763fee6904a5faaf786
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Mar 24 21:59:42 2015 +0200

    split -libs for development

 cinnamon-desktop.spec | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/cinnamon-desktop.spec b/cinnamon-desktop.spec
index ab27ce2..5e32c63 100644
--- a/cinnamon-desktop.spec
+++ b/cinnamon-desktop.spec
@@ -5,7 +5,7 @@
 Summary:	Shared code among cinnamon-session, nemo, etc
 Name:		cinnamon-desktop
 Version:	2.4.2
-Release:	1
+Release:	2
 License:	GPL v2+ and LGPL v2+ add MIT
 Group:		X11/Applications
 Source0:	https://github.com/linuxmint/cinnamon-desktop/archive/%{version}/%{name}-%{version}.tar.gz
@@ -26,7 +26,7 @@ BuildRequires:	xkeyboard-config
 BuildRequires:	xorg-lib-libXext-devel >= 1.1
 BuildRequires:	xorg-lib-libXrandr-devel >= 1.3
 BuildRequires:	xorg-lib-libxkbfile-devel
-Requires(post):	/sbin/ldconfig
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	applnk
 Requires:	glib2 >= 1:2.26.0
 Requires:	hwdata
@@ -42,11 +42,20 @@ The cinnamon-desktop package contains an internal library
 desktop, and also some data files and other shared components of the
 CINNAMON user environment.
 
+%package libs
+Summary:	Libraries for libcinnamon-desktop
+License:	LGPL
+Group:		Libraries
+Conflicts:	%{name} < 2.4.2-2
+
+%description libs
+Libraries for libcinnamon-desktop.
+
 %package devel
 Summary:	Libraries and headers for libcinnamon-desktop
 License:	LGPL v2+
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	glib2-devel >= %{glib2_version}
 Requires:	gtk+3-devel >= %{gtk3_version}
 Requires:	startup-notification-devel >= %{startup_notification_version}
@@ -80,10 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ]; then
 	%glib_compile_schemas
 fi
@@ -91,18 +97,23 @@ fi
 %posttrans
 %glib_compile_schemas
 
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
 %files -f cinnamon-desktop-3.0.lang
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING COPYING.LIB README
 %attr(755,root,root) %{_bindir}/cinnamon-desktop-migrate-mediakeys
 %{_datadir}/glib-2.0/schemas/org.cinnamon.*.xml
 %{_libexecdir}/cinnamon-rr-debug
-# LGPL
-%{_libdir}/libcinnamon-desktop.so.*.*.*
-%ghost %{_libdir}/libcinnamon-desktop.so.4
 %{_libdir}/girepository-1.0/CDesktopEnums-3.0.typelib
 %{_libdir}/girepository-1.0/CinnamonDesktop-3.0.typelib
 
+%files libs
+%defattr(644,root,root,755)
+%{_libdir}/libcinnamon-desktop.so.*.*.*
+%ghost %{_libdir}/libcinnamon-desktop.so.4
+
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/libcinnamon-desktop.so
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cinnamon-desktop.git/commitdiff/c168fce7511c225bc30f2763fee6904a5faaf786



More information about the pld-cvs-commit mailing list