rpms/lash/devel lash.spec,1.21,1.22

Mon Jun 15 20:59:44 UTC 2009

Author: oget

Update of /cvs/pkgs/rpms/lash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5247

Modified Files:
	lash.spec 
Log Message:
* Sat Jun 13 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.5.4-5
- Re-enable python package
- Some macro consistency cleanup
- Update scriptlets according to new guidelines
- Make the .desktop file nicer
- Update description
- Remove rpath
- Clear some rpmlints



Index: lash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lash/devel/lash.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22

--- lash.spec	22 Mar 2009 16:32:32 -0000	1.21
+++ lash.spec	15 Jun 2009 20:59:14 -0000	1.22
@@ -1,9 +1,9 @@
-# %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary:      LASH Audio Session Handler
 Name:         lash
 Version:      0.5.4
-Release:      4%{?dist}
+Release:      5%{?dist}
 License:      GPLv2+
 Group:        System Environment/Libraries
 URL:          http://www.nongnu.org/lash/
@@ -14,20 +14,19 @@ BuildRoot:    %{_tmppath}/%{name}-%{vers
 BuildRequires: alsa-lib-devel, e2fsprogs-devel, gtk2-devel 
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: libxml2-devel, readline-devel, texi2html
-# BuildRequires: python-devel swig
-
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
+BuildRequires: python-devel swig
 
 BuildRequires:    desktop-file-utils
 
 %description
-LASH is a session management system for JACK and ALSA audio
-applications on GNU/Linux.
+LASH is a session management system for JACK and ALSA audio applications on
+GNU/Linux. It allows you to save and restore audio sessions consisting of
+multiple interconneced applications, restoring program state (i.e. loaded
+patches) and the connections between them.
 
 %package devel
 Summary:      Development files for LASH
-Group: 	      Development/Libraries
+Group:        Development/Libraries
 Requires:     %{name} = %{version}-%{release}
 Requires:     jack-audio-connection-kit-devel alsa-lib-devel e2fsprogs-devel
 Requires:     pkgconfig
@@ -35,23 +34,25 @@ Requires:     pkgconfig
 %description devel
 Development files for the LASH library.
 
-# %package python
-# Summary:      Python wrapper for LASH
-# Group: 	      Development/Libraries
-# Requires:     %{name} = %{version}-%{release}
-# Requires:     jack-audio-connection-kit-devel alsa-lib-devel e2fsprogs-devel
-# Requires:     python
-
-# %description python
-# Contains Python language bindings for developing Python applications that
-# use LASH.
+%package -n python-lash
+Summary:      Python wrapper for LASH
+Group:        System Environment/Libraries
+Requires:     %{name} = %{version}-%{release}
+
+%description -n python-lash
+Contains Python language bindings for developing Python applications that use
+LASH.
 
 %prep
 %setup -q
 %patch0 -p0
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %configure --disable-static --disable-serv-inst --disable-pylash
+export am_cv_python_pythondir=%{python_sitearch}
+CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %configure --disable-static --disable-serv-inst
+# remove rpath from libtool
+sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
@@ -60,7 +61,10 @@ mkdir -p %{buildroot}%{_sysconfdir}
 make DESTDIR=%{buildroot} install
 rm -f %{buildroot}%{_infodir}/dir
 rm -f %{buildroot}%{_libdir}/liblash.la
-# rm -f %{buildroot}%{python_sitearch}/_lash.la
+rm -f %{buildroot}%{python_sitearch}/_lash.la
+
+# Fix permission
+chmod -x %{buildroot}%{python_sitearch}/lash.py
 
 # Move icons to the right place
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps
@@ -85,19 +89,19 @@ rm -rf %{buildroot}%{_datadir}/lash
 cat << EOF > %{name}-panel.desktop
 [Desktop Entry]
 Name=LASH Panel
-Comment=LASH Panel
+GenericName=LASH Control Panel
+Comment=LASH Control Panel
 Icon=lash.png
 Exec=%{_bindir}/lash_panel
 Terminal=false
 Type=Application
 EOF
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor fedora              \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+  --dir %{buildroot}%{_datadir}/applications \
   --add-category X-Fedora                         \
   --add-category AudioVideo                       \
-  --add-category Application                      \
-  %{name}-panel.desktop
+  lash-panel.desktop
 
 # Work around the newer texi2html which is behaving somehow else
 if [ ! -d docs/lash-manual-html-split/lash-manual/ ]; then
@@ -111,20 +115,20 @@ rm -rf %{buildroot}
 %post
 /sbin/ldconfig
 # update icon themes
-touch %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
-exit 0
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
 /sbin/ldconfig
 # update icon themes
-touch %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README docs/lash-manual-html-split/lash-manual icons/lash.xcf
@@ -137,7 +141,7 @@ fi
 %{_datadir}/icons/hicolor/96x96/apps/lash.png
 %{_datadir}/icons/hicolor/scalable/apps/lash.svg
 %{_datadir}/xml/lash
-%{_datadir}/applications/*%{name}-panel.desktop
+%{_datadir}/applications/*lash-panel.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -145,14 +149,21 @@ fi
 %{_includedir}/lash-1.0
 %{_libdir}/pkgconfig/lash*
 
-# %files python
-# %defattr(-,root,root,0755)
-# %{python_sitearch}/*lash*.so
-# %{python_sitearch}/*lash*.py
-# %{python_sitearch}/*lash*.pyc
-# %{python_sitearch}/*lash*.pyo
+%files -n python-lash
+%defattr(-,root,root,-)
+%{python_sitearch}/_lash.so
+%{python_sitearch}/lash.py*
 
 %changelog
+* Sat Jun 13 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.5.4-5
+- Re-enable python package
+- Some macro consistency cleanup
+- Update scriptlets according to new guidelines
+- Make the .desktop file nicer
+- Update description
+- Remove rpath
+- Clear some rpmlints
+
 * Sun Mar 22 2009 Robert Scheck <robert at fedoraproject.org> - 0.5.4-4
 - Work around the newer texi2html which is behaving somehow else
 
@@ -204,12 +215,12 @@ fi
 - The devel package must Require e2fsprogs-devel.
 
 * Sun Jun 26 2006 Anthony Green <green at redhat.com> 0.5.1-5
-- Use || : is %post(un) scripts.
+- Use || : is %%post(un) scripts.
 
 * Sun Jun 26 2006 Anthony Green <green at redhat.com> 0.5.1-4
-- Fix files reference to %{_datadir}/xml/lash.
+- Fix files reference to %%{_datadir}/xml/lash.
 - Don't use update-desktop-database.
-- Use %{version} in Source0.
+- Use %%{version} in Source0.
 
 * Mon Jun 19 2006 Anthony Green <green at redhat.com> 0.5.1-3
 - Fix changelog entries.
@@ -227,7 +238,7 @@ fi
 - Add lash-0.5.1-service.patch.
 - Fix some BuildRequires.
 - The devel package Requires things now.
-- Use %{_infodir}.
+- Use %%{_infodir}.
 - Delete the texinfo dir file.
 - Add -texi-dir patch.
 - Install info files properly.


