rpms/em8300/devel .cvsignore, 1.18, 1.19 em8300.spec, 1.24, 1.25 sources, 1.18, 1.19

[Ville Skyttä]

Author: scop

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

Modified Files:
	.cvsignore em8300.spec sources 
Log Message:
* Fri Feb 20 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.17.2-2
- Improve icon cache refresh scriptlets, move them to -utils where they belong.
- Make -devel subpackage noarch when built with rpmbuild >= 4.6.0.

* Sun Nov 09 2008 Felix Kaechele <felix at fetzig dot org> - 0.17.2-1
- 0.17.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	14 Oct 2008 21:02:12 -0000	1.18
+++ .cvsignore	20 Feb 2009 18:19:37 -0000	1.19
@@ -1 +1 @@
-em8300-nofirmware-0.17.2-rc1.tar.lzma
+em8300-nofirmware-0.17.2.tar.gz


Index: em8300.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/devel/em8300.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- em8300.spec	14 Oct 2008 21:02:12 -0000	1.24
+++ em8300.spec	20 Feb 2009 18:19:37 -0000	1.25
@@ -1,16 +1,17 @@
-%define prever  rc1
+%global rpmver  %(v=$(rpmbuild --version | sed -e 's/.* //') ; echo ${v:-0})
+#global prever  rc1
 
 Name:           em8300
 Version:        0.17.2
-Release:        0%{?prever:.1.%{prever}}%{?dist}
+Release:        2%{?prever:.%{prever}}%{?dist}
 Summary:        DXR3/Hollywood Plus MPEG decoder card support tools
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://dxr3.sourceforge.net/
 #Source0: http://dxr3.sourceforge.net/download/em8300-%{version}%{?prever:-%{prever}}.tar.gz with modules/em8300.uc removed
-Source0:        %{name}-nofirmware-%{version}%{?prever:-%{prever}}.tar.lzma
-#Source0:        http://downloads.sourceforge.net/dxr3/%{name}-nofirmware-%{version}%{?prever:-%{prever}}.tar.gz
+#Source0:        %{name}-nofirmware-%{version}%{?prever:-%{prever}}.tar.lzma
+Source0:        http://downloads.sourceforge.net/dxr3/%{name}-nofirmware-%{version}%{?prever:-%{prever}}.tar.gz
 Source1:        %{name}.console.perms
 Source2:        http://cachalot.mine.nu/src/dxr3/em8300-README-modprobe.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +40,9 @@
 %package        devel
 Summary:        Development files for DXR3/Hollywood Plus MPEG decoder cards
 Group:          Development/Libraries
+%if "%{rpmver}" >= "4.6.0"
+BuildArch:      noarch
+%endif
 # Does not require main package on purpose: #189400
 Requires:       kernel-headers
 
@@ -99,19 +103,17 @@
 %pre
 getent group video >/dev/null || groupadd -r video || :
 
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
-:
+%post utils
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
-%postun
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+%postun utils
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
-:
+
+%posttrans utils
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files -f %{name}.files
@@ -139,6 +141,13 @@
 
 
 %changelog
+* Fri Feb 20 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.17.2-2
+- Improve icon cache refresh scriptlets, move them to -utils where they belong.
+- Make -devel subpackage noarch when built with rpmbuild >= 4.6.0.
+
+* Sun Nov 09 2008 Felix Kaechele <felix at fetzig dot org> - 0.17.2-1
+- 0.17.2
+
 * Tue Oct 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.17.2-0.1.rc1
 - 0.17.2-rc1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	14 Oct 2008 21:02:12 -0000	1.18
+++ sources	20 Feb 2009 18:19:37 -0000	1.19
@@ -1 +1 @@
-8b35907a4c3d9eb5120fdd74c8ce7bf1  em8300-nofirmware-0.17.2-rc1.tar.lzma
+8796a6ea10bca6a150735a773b554e98  em8300-nofirmware-0.17.2.tar.gz