diff --git a/.abf.yml b/.abf.yml index 1302230..8563d54 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ sources: - "Joomla_1.5.20-Stable-Full_Package.tar.bz2": a7349ed02bea09bfd562b9aeae62da167b01f33c + "Joomla_2.5.4-Stable-Full_Package.tar.gz": 5b1f2815e10ec41206b0797d4872f098f1a9c2c2 "joomla-htaccess.patch.bz2": 599256483a14bdc4abf3ba93eb6dbb1aa839f90d diff --git a/joomla.spec b/joomla.spec index b596024..7b3cfd7 100644 --- a/joomla.spec +++ b/joomla.spec @@ -4,12 +4,12 @@ Summary: Joomla Open Source (CMS) Name: joomla -Version: 1.5.20 +Version: 2.5.4 Release: %mkrel 1 License: GPLv2+ Group: System/Servers URL: http://www.joomla.org/ -Source0: Joomla_%{version}-Stable-Full_Package.tar.bz2 +Source0: Joomla_%{version}-Stable-Full_Package.tar.gz Source1: joomla-16x16.png Source2: joomla-32x32.png Source3: joomla-48x48.png @@ -47,7 +47,7 @@ Administrative web interface for Joomla Open Source (CMS) %prep %setup -q -c -n %{name}-%{version} -%patch0 +#%patch0 # clean up CVS stuff for i in `find . -type d -name CVS` `find . -type f -name .cvs\*` `find . -type f -name .#\*`; do @@ -222,7 +222,7 @@ rm -rf %{buildroot} %dir %attr(0755,apache,root) /var/www/%{name}/components %dir %attr(0755,apache,root) /var/www/%{name}/images %dir %attr(0755,apache,root) /var/www/%{name}/images/banners -%dir %attr(0755,apache,root) /var/www/%{name}/images/stories +#%dir %attr(0755,apache,root) /var/www/%{name}/images/stories %dir %attr(0755,apache,root) /var/www/%{name}/language %dir %attr(0755,apache,root) /var/www/%{name}/media %dir %attr(0755,apache,root) /var/www/%{name}/modules @@ -232,7 +232,7 @@ rm -rf %{buildroot} %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/httpd/conf/webapps.d/%{name}-administrator.conf /var/www/%{name}/administrator -%dir %attr(0755,apache,root) /var/www/%{name}/administrator/backups +#%dir %attr(0755,apache,root) /var/www/%{name}/administrator/backups %dir %attr(0755,apache,root) /var/www/%{name}/administrator/components %dir %attr(0755,apache,root) /var/www/%{name}/administrator/modules %dir %attr(0755,apache,root) /var/www/%{name}/administrator/templates @@ -240,181 +240,3 @@ rm -rf %{buildroot} %{_miconsdir}/%{name}.png %{_liconsdir}/%{name}.png %{_datadir}/applications/*.desktop - - -%changelog -* Tue Jul 27 2010 Jerome Martin 1.5.20-1mdv2011.0 -+ Revision: 561199 -- Version 1.5.20 - -* Wed Apr 28 2010 Jerome Martin 1.5.17-1mdv2010.1 -+ Revision: 540489 -- Update to version 1.5.17 - - Add README.urpmi - -* Tue Feb 23 2010 Guillaume Rousse 1.5.15-2mdv2010.1 -+ Revision: 510408 -- rely on filetrigger for reloading apache configuration begining with 2010.1, rpm-helper macros otherwise -- don't duplicate spec-helper job -- restrict access to administrative interface -- web file configuration renaming -- spec cleanup - -* Wed Dec 02 2009 Funda Wang 1.5.15-1mdv2010.1 -+ Revision: 472652 -- new version 1.5.15 - -* Fri Oct 23 2009 Oden Eriksson 1.5.14-3mdv2010.0 -+ Revision: 459032 -- P1: php-5.3.x fixes - - + Jerome Martin - - Fixed bug #40934 - -* Fri Oct 09 2009 Jerome Martin 1.5.14-2mdv2010.0 -+ Revision: 456339 -- rebuild - -* Sat Aug 01 2009 Frederik Himpe 1.5.14-1mdv2010.0 -+ Revision: 406972 -- Update to new version 1.5.14 - -* Thu Jul 23 2009 Frederik Himpe 1.5.13-1mdv2010.0 -+ Revision: 399040 -- Update to new version 1.5.13 - -* Fri Jun 05 2009 Frederik Himpe 1.5.11-1mdv2010.0 -+ Revision: 383125 -- Update to new version 1.5.11 -- Use tar.bz2 source package instead of zip, remove source URL because it - changes for every new version anyway - -* Tue Mar 31 2009 Oden Eriksson 1.5.10-1mdv2009.1 -+ Revision: 362832 -- 1.5.10 (multiple security fixes) - -* Sat Jan 10 2009 Funda Wang 1.5.9-1mdv2009.1 -+ Revision: 327993 -- New verrsion 1.5.9 - -* Wed Nov 12 2008 Funda Wang 1.5.8-1mdv2009.1 -+ Revision: 302415 -- New version 1.5.8 - -* Wed Sep 10 2008 Funda Wang 1.5.7-1mdv2009.0 -+ Revision: 283426 -- New version 1.5.7 - -* Wed Aug 13 2008 Funda Wang 1.5.6-1mdv2009.0 -+ Revision: 271449 -- New version 1.5.6 - -* Mon Jul 28 2008 Funda Wang 1.5.5-1mdv2009.0 -+ Revision: 250795 -- New version 1.5.5 - -* Tue Jul 08 2008 Funda Wang 1.5.4-1mdv2009.0 -+ Revision: 232677 -- New version 1.5.4 - - + Pixel - - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas - -* Wed Apr 30 2008 Funda Wang 1.5.3-1mdv2009.0 -+ Revision: 199416 -- New version 1.5.3 - -* Sat Feb 09 2008 Funda Wang 1.5.1-1mdv2008.1 -+ Revision: 164459 -- New version 1.5.1 - -* Sat Jan 26 2008 Funda Wang 1.5.0-1mdv2008.1 -+ Revision: 158336 -- remove missing files -- New version 1.5.0 - -* Mon Jan 21 2008 Oden Eriksson 1.0.13-3mdv2008.1 -+ Revision: 155803 -- second sec fix release (really 1.0.14-RC1) - - + Thierry Vignaud - - drop old menu - - kill re-definition of %%buildroot on Pixel's request - - + Olivier Blin - - restore BuildRoot - -* Tue Aug 28 2007 Oden Eriksson 1.0.13-2mdv2008.0 -+ Revision: 72690 -- added a security fix -- nuke wrong xdg stuff - -* Sun Aug 19 2007 Colin Guthrie 1.0.13-1mdv2008.0 -+ Revision: 67006 -- New upstream version: 1.0.13 - - -* Mon Jan 01 2007 Oden Eriksson 1.0.12-1mdv2007.0 -+ Revision: 103005 -- 1.0.12 -- drop upstream patches; P0 - -* Mon Dec 11 2006 Oden Eriksson 1.0.11-5mdv2007.1 -+ Revision: 94787 -- make the main package require the administrator subpackage (fixes #27602) - -* Mon Oct 30 2006 Oden Eriksson 1.0.11-4mdv2007.1 -+ Revision: 73682 -- also add the patch... -- added P0 to make admin.mambots.php work -- rebuild -- Import joomla - -* Fri Sep 08 2006 Oden Eriksson 1.0.11-2 -- use the www-browser script - -* Thu Aug 31 2006 Oden Eriksson 1.0.11-1 -- 1.0.11 (Major security fixes) -- fix xdg menu - -* Tue Jun 13 2006 Oden Eriksson 1.0.9-2mdv2007.0 -- relocate it to /var/www/joomla and add a apache config file -- add a menu entry, icons, etc... - -* Mon Jun 12 2006 Oden Eriksson 1.0.9-1mdv2007.0 -- 1.0.9: - o 12 Low Level Security Fixes - o 160+ General bug fixes - o Several Performance enhancements - -* Fri Mar 10 2006 Oden Eriksson 1.0.8-1mdk -- 1.0.8: - o 37 Security Fixes - o 70+ General bug fixes - o Several Performance enhancements - -* Mon Feb 06 2006 Oden Eriksson 1.0.7-2mdk -- make the installation a little easier... (#21038) - -* Tue Jan 03 2006 Oden Eriksson 1.0.7-1mdk -- use the Joomla fork instead (#20909) - -* Tue Jan 03 2006 Oden Eriksson 4.5.3h-1mdk -- 4.5.3h - -* Sun Apr 03 2005 Oden Eriksson 4.5.2.1-1mdk -- added P0 (security fix) and bump version - -* Sun Apr 03 2005 Oden Eriksson 4.5.2-1mdk -- 4.5.2 -- strip away annoying ^M - -* Fri Oct 29 2004 Oden Eriksson 4.5.1a-1mdk -- 4.5.1a - -* Thu Jun 24 2004 Oden Eriksson 4.5-2mdk -- added the 1.0.7-1.0.8 diff - -* Tue May 11 2004 Oden Eriksson 4.5-1mdk -- initial package -