rpms/apollon/F-8 apollon.spec,1.11,1.12

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/apollon/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29203

Modified Files:
	apollon.spec 
Log Message:
* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.1-12
- -libs subpkg, multiarch conflicts in apollon (#340661)



Index: apollon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apollon/F-8/apollon.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- apollon.spec	25 Aug 2007 21:49:41 -0000	1.11
+++ apollon.spec	30 Oct 2007 15:06:42 -0000	1.12
@@ -2,7 +2,7 @@
 Summary: Filesharing client
 Name:	 apollon
 Version: 1.0.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Internet
@@ -16,6 +16,8 @@
 # http://bugzilla.redhat.com/185258
 Patch2: apollon-1.0.1-firstrun.patch
 
+Requires: %{name}-libs = %{version}-%{release}
+
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: gift-devel
@@ -24,6 +26,15 @@
 %description
 A filesharing client which uses giFT.
 
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+# helps multilib upgrades
+Obsoletes: %{name} < %{version}-%{release}
+Requires:  %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q 
@@ -44,23 +55,23 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --dir %{buildroot}%{_datadir}/applications/kde \
   --vendor="" \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/*.desktop
+  %{buildroot}%{_datadir}/applnk/Applications/*.desktop
 
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
 # HTML (1.0)
 HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
@@ -75,39 +86,48 @@
 fi
 
 ## Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.so
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 for icon_theme in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/${icon_theme} ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
 done
 
 %postun
-/sbin/ldconfig
 for icon_theme in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/${icon_theme} ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
 done
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/apollon
-%{_libdir}/libapollon.*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/icons/crystalsvg/*/*/*
 %{_datadir}/icons/hicolor/*/*/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libapollon.so.*
+
 
 %changelog
+* Mon Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.1-12
+- -libs subpkg, multiarch conflicts in apollon (#340661)
+
 * Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.1-11
 - fixup d-f-i usage
 - respin (BuildID)