[em8300] Clean up specfile stuff no longer needed with Fedora or EL6+. Do icon dir timestamp update in %post
Ville Skyttä
scop at fedoraproject.org
Sun Nov 13 21:46:44 UTC 2011
commit 5a8ea3f94718028ff65e851a36d7e77363f988df
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Sun Nov 13 23:46:35 2011 +0200
Clean up specfile stuff no longer needed with Fedora or EL6+.
Do icon dir timestamp update in %post with lua.
em8300.spec | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/em8300.spec b/em8300.spec
index 094b9c0..71ab76a 100644
--- a/em8300.spec
+++ b/em8300.spec
@@ -1,19 +1,16 @@
-%global rpmver %(v=$(rpmbuild --version | sed -e 's/.* //') ; echo ${v:-0})
#global prever rc1
Name: em8300
Version: 0.18.0
-Release: 4%{?prever:.%{prever}}%{?dist}
+Release: 5%{?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
Source1: %{name}.console.perms
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
@@ -30,7 +27,6 @@ Provides: em8300-kmod-common = %{version}-%{release}
%package utils
Summary: GUI utilities for DXR3/Hollywood plus MPEG decoder cards
-Group: User Interface/X Hardware Support
Requires: %{name} = %{version}-%{release}
%description utils
@@ -38,10 +34,7 @@ Requires: %{name} = %{version}-%{release}
%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
@@ -62,7 +55,6 @@ make %{?_smp_mflags} LIBS="-lX11 -lm"
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
@@ -98,12 +90,8 @@ if [ ! -s %{name}.files ] ; then
fi
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post utils
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+%post utils -p <lua>
+posix.utime("%{_datadir}/icons/hicolor")
%postun utils
if [ $1 -eq 0 ] ; then
@@ -116,7 +104,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.files
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README modules/README-modoptions
%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
%config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
@@ -124,7 +111,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man1/em8300setup.1*
%files utils
-%defattr(-,root,root,-)
%doc overlay/configs/
%{_bindir}/autocal
%{_bindir}/dhc
@@ -134,12 +120,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/48x48/apps/dhc.xpm
%files devel
-%defattr(-,root,root,-)
%{_includedir}/linux/em8300.h
%{_datadir}/em8300/
%changelog
+* Sun Nov 13 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.18.0-5
+- Clean up specfile stuff no longer needed with Fedora or EL6+.
+- Do icon dir timestamp update in %%post with lua.
+
* Sun Nov 13 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.18.0-4
- Avoid main package X11 dependency.
More information about the scm-commits
mailing list