[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] =?utf-8?q?HG=3A_xine-lib-1=2E2=3A_Fix_RPM_package_gene?= =?utf-8?q?ration=2E?=
From:       Chris_Rankin <rankincj () yahoo ! com>
Date:       2012-07-28 10:09:27
Message-ID: 5e04b64acdb3abe774a6.1343418261 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Chris Rankin <rankincj@yahoo.com>
# Date 1343418261 -3600
# Node ID 5e04b64acdb3abe774a67ceee345c4f42fd2b007
# Branch  default
# Parent  07eba8d2d5f4d92decd614190f5bcfbef6fe3fd5
Fix RPM package generation.

diff --git a/misc/build_rpms.sh.in b/misc/build_rpms.sh.in
--- a/misc/build_rpms.sh.in
+++ b/misc/build_rpms.sh.in
@@ -3,7 +3,7 @@
 #DATE=`date +%y%m%d`
 DATE=1
 
-PKGNAME=libxine1
+PKGNAME=libxine2
 
 # Some rpm checks
 RPMVERSION=`rpm --version | tr [A-Z] [a-z] | sed -e 's/[a-z]//g' -e 's/\.//g' -e 's/ \
//g'` @@ -14,14 +14,14 @@
 fi
 
 if [ `expr $RPMVERSION` -lt 400 ]; then
-  RPM_BA="rpm -ba -ta ./@PACKAGE@-@VERSION@.tar.gz"
-  RPM_BB="rpm -bb -ta ./@PACKAGE@-@VERSION@.tar.gz"
+  RPM_BA="rpm -ba -ta ./@PACKAGE@-@VERSION@.tar.bz2"
+  RPM_BB="rpm -bb -ta ./@PACKAGE@-@VERSION@.tar.bz2"
 elif [ `expr $RPMVERSION` -lt 420 ]; then
-  RPM_BA="rpm -ta ./@PACKAGE@-@VERSION@.tar.gz -ba"
-  RPM_BB="rpm -ta ./@PACKAGE@-@VERSION@.tar.gz -bb"
+  RPM_BA="rpm -ta ./@PACKAGE@-@VERSION@.tar.bz2 -ba"
+  RPM_BB="rpm -ta ./@PACKAGE@-@VERSION@.tar.bz2 -bb"
 else
-  RPM_BA="rpmbuild -ta ./@PACKAGE@-@VERSION@.tar.gz -ba"
-  RPM_BB="rpmbuild -ta ./@PACKAGE@-@VERSION@.tar.gz -bb"
+  RPM_BA="rpmbuild -ta ./@PACKAGE@-@VERSION@.tar.bz2 -ba"
+  RPM_BB="rpmbuild -ta ./@PACKAGE@-@VERSION@.tar.bz2 -bb"
 fi
       
 ##VERSION="@XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@"
 --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in
--- a/misc/xine-lib.spec.in
+++ b/misc/xine-lib.spec.in
@@ -1,6 +1,6 @@
 %define shortname  libxine
 %define name       libxine2
-%define version    @SPEC_VERSION@
+%define version    @PACKAGE_VERSION@
 %define release    0
 
 %define major      1
@@ -15,6 +15,9 @@
 %if %{?BUILD_ALSA:0}%{!?BUILD_ALSA:1}
 %define BUILD_ALSA      0
 %endif
+%if %{?BUILD_ARTS:0}%{!?BUILD_ARTS:1}
+%define BUILD_ARTS      0
+%endif
 %if %{?BUILD_DEVEL:0}%{!?BUILD_DEVEL:1}
 %define BUILD_DEVEL     1
 %endif
@@ -659,7 +662,7 @@
 
 
 %prep
-%setup -q -n @TAR_NAME@
+%setup -q -n @PACKAGE_TARNAME@-@PACKAGE_VERSION@
 
 %build
 export CFLAGS="${RPM_OPT_FLAGS}"
@@ -686,7 +689,7 @@
 %if %BUILD_STK
             --with-libstk \
 %endif
-            --enable-syncfb --without-internal-vcdlibs
+            --without-internal-vcdlibs
 
 # Error in libfaad when compiling with mmx or sse enabled, remove it
 %{__mv} contrib/libfaad/Makefile contrib/libfaad/Makefile_save
@@ -704,7 +707,7 @@
 %if %BUILD_DEVEL
 echo "%doc README TODO AUTHORS COPYING ChangeLog" >> \
${RPM_BUILD_DIR}/filelist_%{name}_zw  %else
-echo "%doc README TODO AUTHORS COPYING ChangeLog doc/hackersguide/*.sgml \
doc/hackersguide/*.fig doc/hackersguide/README" >> \
${RPM_BUILD_DIR}/filelist_%{name}_zw +echo "%doc README TODO AUTHORS COPYING \
ChangeLog doc/hackersguide/*.html doc/hackersguide/*.png doc/hackersguide/README" >> \
${RPM_BUILD_DIR}/filelist_%{name}_zw  %endif
 find . -type f | %{__sed} 's,^\.%{_datadir}/doc,\%doc %{_datadir}/doc,' | %{__sed} \
's,^\.,,' >> ${RPM_BUILD_DIR}/filelist_%{name}_zw  find . -type l | %{__sed} \
's,^\.%{_datadir}/doc,\%doc %{_datadir}/doc,' | %{__sed} 's,^\.,,' >> \
${RPM_BUILD_DIR}/filelist_%{name}_zw @@ -715,7 +718,7 @@
 
 %if %BUILD_DEVEL
 echo "%defattr(-,root,root)" > ${RPM_BUILD_DIR}/filelist_%{name}_devel
-echo "%doc doc/hackersguide/*.sgml doc/hackersguide/*.fig doc/hackersguide/README" \
>> ${RPM_BUILD_DIR}/filelist_%{name}_devel +echo "%doc doc/hackersguide/*.html \
> > doc/hackersguide/*.png doc/hackersguide/README" >> \
> > ${RPM_BUILD_DIR}/filelist_%{name}_devel
 %{__mv} ${RPM_BUILD_DIR}/filelist_%{name} ${RPM_BUILD_DIR}/filelist_%{name}_old
 %{__grep} -E "/include/|dhahelper\.o|libxine*\.(so|la)$|\.m4$" \
${RPM_BUILD_DIR}/filelist_%{name}_old | %{__cat} - >> \
${RPM_BUILD_DIR}/filelist_%{name}_devel  %{__grep} -v -E \
"/include/|dhahelper\.o|libxine*\.(so|la)$|\.m4$" \
${RPM_BUILD_DIR}/filelist_%{name}_old | %{__cat} - > \
${RPM_BUILD_DIR}/filelist_%{name}

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog


[prev in list] [next in list] [prev in thread] [next in thread]