[vdr-live] rebuild

Martin Gansser martinkg at fedoraproject.org
Sat Jan 4 14:07:52 UTC 2014


commit a02722365e1f6e89a8f27ef991b47f66a886ee74
Author: Martin Gansser <mgansser at alice.de>
Date:   Sat Jan 4 15:07:38 2014 +0100

    rebuild
    
    - spec file cleanup

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 vdr-live-0.3.0-69f84f9.tar.bz2                     |  Bin 756412 -> 0 bytes
 vdr-live.spec                                      |   22 ++++++++++----------
 ...9f84f95fa875c6f562294b1a6a1ea6f584d3f6c.tar.bz2 |  Bin 0 -> 756741 bytes
 5 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 26e7418..216f4fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /vdr-live-0.3.0-69f84f9.tar.gz
+/vdr-plugin-live-69f84f95fa875c6f562294b1a6a1ea6f584d3f6c.tar.bz2
diff --git a/sources b/sources
index 4e3d9b9..40d13ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ad1a2fb9b45dbc1fafbdd1ccf34ff0a  vdr-live-0.3.0-69f84f9.tar.gz
+f4bdbb1d2b492c6e7a7dd09ebba26447  vdr-plugin-live-69f84f95fa875c6f562294b1a6a1ea6f584d3f6c.tar.bz2
diff --git a/vdr-live.spec b/vdr-live.spec
index 4c2c2fb..6ebf5db 100644
--- a/vdr-live.spec
+++ b/vdr-live.spec
@@ -1,23 +1,19 @@
+%global commit  69f84f95fa875c6f562294b1a6a1ea6f584d3f6c
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global gitrev  69f84f9
 %global pname   live
+%global gitdate 20130504
 
 Name:           vdr-%{pname}
 Version:        0.3.0
-Release:        7.%{gitrev}%{?dist}
-# FIXME: find proper summary
+Release:        8%{?gitdate:.%{gitdate}git%{gitrev}}%{dist}
 Summary:        An interactive web interface for VDR
 
 Group:          Applications/Multimedia
 # The entire source code is GPLv2+ except live/js/mootools/ which is MIT
 License:        GPLv2+ and MIT
 URL:            http://projects.vdr-developer.org/projects/plg-live
-# checkout instructions:
-# git clone git://projects.vdr-developer.org/vdr-plugin-live.git vdr-live
-# cd  vdr-live
-# git rev-parse --short HEAD
-# git archive --format=tar --prefix=vdr-live-%{version}-%{gitrev}/ HEAD | \
-# bzip2 > ../vdr-live-%{version}-%{gitrev}.tar.bz2
-Source0:        %{name}-%{version}-%{gitrev}.tar.bz2
+Source0:        http://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/vdr-plugin-live-69f84f95fa875c6f562294b1a6a1ea6f584d3f6c.tar.bz2
 Source1:        %{name}.conf
 
 BuildRequires:  vdr-devel >= 1.7.30
@@ -45,13 +41,13 @@ Requires:      %{name} = %{version}-%{release}
 This package contains images, themes and JavaScript.
 
 %prep
-%setup -q -n    %{name}-%{version}-%{gitrev}
+%setup -qn vdr-plugin-%{pname}-%{commit}
 
 # delete unused directories and files
 find -name .git -type d -or -name gitignore -type d | xargs rm -rfv
 
 # remove bundled tntnet libraries
-rm -rf http
+rm -rf httpd
 
 iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README
 
@@ -86,6 +82,10 @@ cp -pR live/* $RPM_BUILD_ROOT%{vdr_resdir}/plugins/%{pname}
 
 
 %changelog
+* Sat Jan 04 2014 Martin Gansser <martinkg at fedoraproject.org> - 0.3.0-8.20130504git69f84f9
+- rebuild
+- spec file cleanup
+
 * Fri Jan 03 2014 Martin Gansser <martinkg at fedoraproject.org> - 0.3.0-7.69f84f9
 - add correct source file
 
diff --git a/vdr-plugin-live-69f84f95fa875c6f562294b1a6a1ea6f584d3f6c.tar.bz2 b/vdr-plugin-live-69f84f95fa875c6f562294b1a6a1ea6f584d3f6c.tar.bz2
new file mode 100644
index 0000000..dd79fb3
Binary files /dev/null and b/vdr-plugin-live-69f84f95fa875c6f562294b1a6a1ea6f584d3f6c.tar.bz2 differ


More information about the scm-commits mailing list