packages: adobe-flash/adobe-flash.spec, adobe-flash/mms.cfg (NEW) - move mm...

[glen]

Author: glen                         Date: Mon Feb 21 16:25:59 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move mms.cfg to package as source

---- Files affected:
packages/adobe-flash:
   adobe-flash.spec (1.146 -> 1.147) , mms.cfg (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/adobe-flash/adobe-flash.spec
diff -u packages/adobe-flash/adobe-flash.spec:1.146 packages/adobe-flash/adobe-flash.spec:1.147
--- packages/adobe-flash/adobe-flash.spec:1.146	Tue Feb  8 21:19:39 2011
+++ packages/adobe-flash/adobe-flash.spec	Mon Feb 21 17:25:54 2011
@@ -36,9 +36,10 @@
 Source1:	http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p3_64bit_linux_111710.tar.gz
 # NoSource1-md5:	49b55c7eb8044453e5f6f2e4b3cb4084
 NoSource:	1
+Source2:	mms.cfg
 %else
-Source2:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
-# Source2-md5:	329c25f457fea66ec502b7ef70cb9ede
+Source3:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
+# Source3-md5:	329c25f457fea66ec502b7ef70cb9ede
 %endif
 URL:		http://www.adobe.com/products/flashplayer/
 %if %{with license_agreement}
@@ -107,21 +108,15 @@
 	s- at RELEASE@-%{release}-g
 	s, at SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
 	s, at DATADIR@,%{_datadir}/%{base_name},g
-' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
+' %{SOURCE3} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 
-install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
+cp -p %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 
 %else
 
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_browserpluginsdir}}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/mms.cfg
-# http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=16701594
-# http://www.adobe.com/devnet/flashplayer/articles/flash_player_admin_guide.html
-AutoUpdateDisable=1
-AutoUpdateInterval=0
-# OverrideGPUValidation=true
-EOF
-install *.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/mms.cfg
+install -p *.so $RPM_BUILD_ROOT%{_browserpluginsdir}
 %endif
 
 %clean
@@ -157,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.147  2011/02/21 16:25:54  glen
+- move mms.cfg to package as source
+
 Revision 1.146  2011/02/08 20:19:39  glen
 - 32bit up to 10.2.152.27
 - use simple version macro

================================================================
Index: packages/adobe-flash/mms.cfg
diff -u /dev/null packages/adobe-flash/mms.cfg:1.1
--- /dev/null	Mon Feb 21 17:25:59 2011
+++ packages/adobe-flash/mms.cfg	Mon Feb 21 17:25:54 2011
@@ -0,0 +1,5 @@
+# http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=16701594
+# http://www.adobe.com/devnet/flashplayer/articles/flash_player_admin_guide.html
+AutoUpdateDisable=1
+AutoUpdateInterval=0
+# OverrideGPUValidation=true
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adobe-flash/adobe-flash.spec?r1=1.146&r2=1.147&f=u