packages: w32codec/w32codec.spec - non-conflicting sources

[glen]

Author: glen                         Date: Mon Sep 27 10:42:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- non-conflicting sources

---- Files affected:
packages/w32codec:
   w32codec.spec (1.107 -> 1.108) 

---- Diffs:

================================================================
Index: packages/w32codec/w32codec.spec
diff -u packages/w32codec/w32codec.spec:1.107 packages/w32codec/w32codec.spec:1.108
--- packages/w32codec/w32codec.spec:1.107	Wed Jul 28 11:55:17 2010
+++ packages/w32codec/w32codec.spec	Mon Sep 27 12:42:01 2010
@@ -7,7 +7,7 @@
 %define		source_url	http://www.mplayerhq.hu/MPlayer/releases/codecs
 
 %define		base_name	w32codec
-%define		rel	6
+%define		rel	7
 Summary:	Binary compression/decompression libraries used by movie players
 Summary(pl.UTF-8):	Binarne biblioteki do kompresji/dekompresji dla odtwarzaczy filmów
 %if %{with license_agreement}
@@ -21,12 +21,14 @@
 Group:		Libraries
 %if %{with license_agreement}
 Source0:	%{source_url}/all-%{version}.tar.bz2
+# NoSource0-md5:	0407e8ad132e37ccd3f932448ca201c5
+NoSource:	0
 Provides:	avi-codecs
 Obsoletes:	avi-codecs
 Obsoletes:	w32codec-qt
 %else
-Source0:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
-# Source0-md5:	329c25f457fea66ec502b7ef70cb9ede
+Source1:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
+# Source1-md5:	329c25f457fea66ec502b7ef70cb9ede
 Requires:	rpm-build-tools >= 4.4.37
 Requires:	rpmbuild(macros) >= 1.544
 Provides:	%{base_name}
@@ -63,10 +65,10 @@
 	s- at RELEASE@-%{release}-g
 	s, at SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
 	s, at DATADIR@,%{_datadir}/%{base_name},g
-' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
+' %{SOURCE1} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 chmod +x $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 
-install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
+cp -a %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 
 %else
 install -d $RPM_BUILD_ROOT%{_libdir}/codecs
@@ -99,6 +101,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2010/09/27 10:42:01  glen
+- non-conflicting sources
+
 Revision 1.107  2010/07/28 09:55:17  glen
 - use rpmbuild(macros) virtual, not direct package name
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/w32codec/w32codec.spec?r1=1.107&r2=1.108&f=u