summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Lancaster <alexlan@fedoraproject.org>2010-07-19 23:14:53 -0400
committerAlex Lancaster <alexlan@fedoraproject.org>2010-07-19 23:14:53 -0400
commitbd7c288a0974c92f1e8fb4251e94018730cbcb1c (patch)
treed4ae3834b48962792ef8cb03726b989764785a05
parentfd83b517d6043f39c2507738940d43e2efe1f331 (diff)
downloadxbmc-rpm-bd7c288a0974c92f1e8fb4251e94018730cbcb1c.tar.gz
xbmc-rpm-bd7c288a0974c92f1e8fb4251e94018730cbcb1c.tar.xz
xbmc-rpm-bd7c288a0974c92f1e8fb4251e94018730cbcb1c.zip
- Sync with Dharma branch r31911
-rwxr-xr-xxbmc-generate-tarball-xz.sh10
-rw-r--r--xbmc.spec7
2 files changed, 13 insertions, 4 deletions
diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index 39cb23b..0dd1642 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -2,13 +2,19 @@
MAJORVERSION=10.5
+# pull from Dharma branch
+SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma
+
+# uncomment this to switch to trunk
+#SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk
+
# get version number
-SVNVERSION=$(svn info https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk |grep "Revision:"|cut -d' ' -f2)
+SVNVERSION=$(svn info $SVNURL |grep "Revision:"|cut -d' ' -f2)
#VERSION=${1-9.11}
VERSION=$MAJORVERSION-$SVNVERSION
-svn export -r $SVNVERSION https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk xbmc-$VERSION
+svn export -r $SVNVERSION $SVNURL xbmc-$VERSION
# don't need to extra tarball, already expanded
#tar -xzvf xbmc-$VERSION.tar.gz
diff --git a/xbmc.spec b/xbmc.spec
index 3e3eeb0..8da9055 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -1,9 +1,9 @@
-%global SVNVERSION 31977
+%global SVNVERSION 31991
%global DIRVERSION %{version}-%{SVNVERSION}
Name: xbmc
Version: 10.5
-Release: 0.1.20100719svn%{SVNVERSION}%{?dist}
+Release: 0.2.20100719svn%{SVNVERSION}%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -266,6 +266,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/*/*.png
%changelog
+* Mon Jul 19 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.2.20100719svn31991
+- Sync with Dharma branch
+
* Mon Jul 19 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.1.20100719svn31977
- Major overhaul for 10.x version of XBMC
- Fix file section for better FHS-compliance