rpms/xine-lib-extras-freeworld/F-9 xine-lib-extras-freeworld.spec, 1.2, 1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/free/rpms/xine-lib-extras-freeworld/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25742

Modified Files:
	xine-lib-extras-freeworld.spec 
Log Message:
* Thu Sep 04 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-2
- bump Obsoletes: xine-lib-extras-nonfree
- spec cosmetics



Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-9/xine-lib-extras-freeworld.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xine-lib-extras-freeworld.spec	23 Aug 2008 18:20:46 -0000	1.2
+++ xine-lib-extras-freeworld.spec	4 Sep 2008 12:28:40 -0000	1.3
@@ -6,14 +6,14 @@
 Name:           xine-lib-extras-freeworld
 Summary:        Non-free extra codecs for the Xine library
 Version:        1.1.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
 Source0:        http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
 Patch0:         xine-lib-1.1.3-optflags.patch
 Patch6:         xine-lib-1.1.1-deepbind-939.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
@@ -38,9 +38,9 @@
 
 # obsolete old livna package
 Provides:       xine-lib-extras-nonfree = %{version}-%{release}
-Obsoletes:      xine-lib-extras-nonfree < 1.1.12-2
+Obsoletes:      xine-lib-extras-nonfree < 1.1.15-2
 
-# obsolete old frehsrpms package
+# obsolete old freshrpms package
 Provides:       xine-lib-moles = %{version}-%{release}
 Obsoletes:      xine-lib-moles < 1.1.12-2
 
@@ -63,7 +63,8 @@
 
 %build
 # Keep order of options the same as in ./configure --help for easy maintenance
-%configure --disable-dependency-tracking \
+%configure \
+    --disable-dependency-tracking \
     --with-external-ffmpeg \
     --enable-ipv6 \
     --disable-opengl \
@@ -93,15 +94,15 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 # Removing useless files
-rm -rf $RPM_BUILD_ROOT%{_bindir}
-rm -rf $RPM_BUILD_ROOT%{_includedir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+rm -rf %{buildroot}%{_bindir}
+rm -rf %{buildroot}%{_includedir}
+rm -rf %{buildroot}%{_datadir}
+rm -rf %{buildroot}%{_libdir}/lib*
+rm -rf %{buildroot}%{_libdir}/pkgconfig
 
 # Plugins - credits go to the SuSE RPM maintainer, congrats
 cat > plugins << EOF
@@ -150,7 +151,7 @@
 #
 EOF
 
-DIR="$(ls -1d $RPM_BUILD_ROOT%{_libdir}/xine/plugins/*)"
+DIR="$(ls -1d %{buildroot}%{_libdir}/xine/plugins/*)"
 mv $DIR $DIR.temp
 mkdir -p $DIR/post
 grep -v ^# plugins | while read i; do
@@ -160,7 +161,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -171,6 +172,10 @@
 
 
 %changelog
+* Thu Sep 04 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-2
+- bump Obsoletes: xine-lib-extras-nonfree
+- spec cosmetics
+
 * Mon Aug 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-1
 - 1.1.15