packages: wpmu/wpmu.spec - move wp-admin to main package - drop htaccess cr...

[glen]

Author: glen                         Date: Mon Jan 25 17:24:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move wp-admin to main package
- drop htaccess creation in setup (included in apache config)

---- Files affected:
packages/wpmu:
   wpmu.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/wpmu/wpmu.spec
diff -u packages/wpmu/wpmu.spec:1.12 packages/wpmu/wpmu.spec:1.13
--- packages/wpmu/wpmu.spec:1.12	Thu Jan 21 20:12:34 2010
+++ packages/wpmu/wpmu.spec	Mon Jan 25 18:24:19 2010
@@ -6,7 +6,7 @@
 Summary(en.UTF-8):	WordPress µ
 Name:		wpmu
 Version:	2.9.1.1
-Release:	0.42
+Release:	0.49
 License:	GPL
 Group:		Applications/Publishing
 Source0:	http://mu.wordpress.org/wordpress-mu-%{version}.tar.gz
@@ -108,7 +108,7 @@
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 cp -a $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
-rm $RPM_BUILD_ROOT%{_appdir}/{README.txt,license.txt}
+rm $RPM_BUILD_ROOT%{_appdir}/{README.txt,license.txt,htaccess.dist}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -176,6 +176,9 @@
 %{_appdir}/wp-content/themes/default
 %{_appdir}/wp-content/themes/home
 
+# needed for daily moderation
+%{_appdir}/wp-admin
+
 %attr(775,root,http) /var/lib/wpmu
 
 # -setup package
@@ -184,14 +187,8 @@
 
 %files setup
 %defattr(644,root,root,755)
-#%attr(755,root,root) %{_sbindir}/wpmu-secure
-#%attr(755,root,root) %{_sbindir}/wpmu-setup
-#%{_appdir}/wp-secure.sh
-#%{_appdir}/wp-setup.sh
-%{_appdir}/htaccess.dist
 %{_appdir}/index-install.php
 %{_appdir}/wp-config-sample.php
-%{_appdir}/wp-admin
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -199,6 +196,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/01/25 17:24:19  glen
+- move wp-admin to main package
+- drop htaccess creation in setup (included in apache config)
+
 Revision 1.12  2010/01/21 19:12:34  glen
 - up to 2.9.1.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpmu/wpmu.spec?r1=1.12&r2=1.13&f=u