[vdr-skinnopacity/f20: 5/5] Update to 1.0.4

Martin Gansser martinkg at fedoraproject.org
Sat Feb 1 15:10:04 UTC 2014


commit 9b7858549bb2cb452ae78446dfe79768eae9fc0f
Author: Martin Gansser <mgansser at alice.de>
Date:   Sat Feb 1 16:10:17 2014 +0100

    Update to 1.0.4

 .gitignore            |    1 +
 sources               |    2 +-
 vdr-skinnopacity.spec |   30 ++++++++++++++----------------
 3 files changed, 16 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d003a7..4b36478 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /skin-nopacity-0b29805c23c99922bbade2824d93126bab112316.tar.bz2
+/vdr-skinnopacity-1.0.4.tgz
diff --git a/sources b/sources
index 2876c48..2221467 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a7dcd05ff40730eb00fb7c5ec213902b  skin-nopacity-0b29805c23c99922bbade2824d93126bab112316.tar.bz2
+760bbb000982a26765c5a7a1a5b1c4be  vdr-skinnopacity-1.0.4.tgz
diff --git a/vdr-skinnopacity.spec b/vdr-skinnopacity.spec
index fff4a24..4dbe3a1 100644
--- a/vdr-skinnopacity.spec
+++ b/vdr-skinnopacity.spec
@@ -1,19 +1,12 @@
-%global commit 0b29805c23c99922bbade2824d93126bab112316
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global gitdate 20131221
-
 Name:           vdr-skinnopacity
-Version:        1.0.3
-Release:        7.%{gitdate}git%{shortcommit}%{?dist}
+Version:        1.0.4
+Release:        1%{?dist}
 Summary:        A highly customizable native true color skin for the Video Disc Recorder
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://projects.vdr-developer.org/projects/skin-nopacity
-# how to get the tarball
-# go to http://projects.vdr-developer.org/git/skin-nopacity.git/commit/
-# click the link behind commit, then select the download links below.
-Source0:        http://projects.vdr-developer.org/git/skin-nopacity.git/snapshot/skin-nopacity-%{commit}.tar.bz2
+Source0:        http://projects.vdr-developer.org/attachments/download/1625/vdr-skinnopacity-%{version}.tgz
 # informed upstream to put copyright and licensing details in source files
 # http://projects.vdr-developer.org/issues/1679
 # Configuration files for plugin parameters. These are Fedora specific and not in upstream.
@@ -38,7 +31,7 @@ Requires:      %{name} = %{version}-%{release}
 This package contains icons files.
  
 %prep
-%setup -qn skin-nopacity-%{commit}
+%setup -qn skinnopacity-%{version}
 iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README
 
 %build
@@ -46,12 +39,12 @@ make CFLAGS="%{optflags}" IMAGELIB=graphicsmagick %{?_smp_mflags} all
 
 %install
 # make install would install the themes under /etc, let's not use that
-make install-lib install-i18n install-icons DESTDIR=$RPM_BUILD_ROOT
+make install-lib install-i18n install-icons DESTDIR=%{buildroot}
 # install the themes to the custom location used in Fedora
-install -dm 755 $RPM_BUILD_ROOT%{vdr_vardir}/themes
-install -dm 755 $RPM_BUILD_ROOT%{vdr_vardir}/plugins/skinnopacity/themeconfigs
-install -pm 644 themes/*.theme $RPM_BUILD_ROOT%{vdr_vardir}/themes/
-install -pm 644 conf/theme-* $RPM_BUILD_ROOT%{vdr_vardir}/plugins/skinnopacity/themeconfigs/
+install -dm 755 %{buildroot}%{vdr_vardir}/themes
+install -dm 755 %{buildroot}%{vdr_vardir}/plugins/skinnopacity/themeconfigs
+install -pm 644 themes/*.theme %{buildroot}%{vdr_vardir}/themes/
+install -pm 644 conf/theme-* %{buildroot}%{vdr_vardir}/plugins/skinnopacity/themeconfigs/
 
 # skinnopacity.conf
 install -Dpm 644 %{SOURCE1} \
@@ -71,6 +64,11 @@ install -Dpm 644 %{SOURCE1} \
 %{vdr_resdir}/plugins/skinnopacity/icons/
 
 %changelog
+* Sat Feb 01 2014 Martin Gansser <martinkg at fedoraproject.org> - 1.0.4-1
+- new release
+- spec file cleanup
+- changed to %%{buildroot} macro
+
 * Mon Jan 20 2014 Martin Gansser <martinkg at fedoraproject.org> - 1.0.3-7.20131221git0b29805
 - removed requirement ImageMagick-c++-devel
 - added requirement GraphicsMagick-c++-devel


More information about the scm-commits mailing list