rpms/gallery2/FC-6 .cvsignore, 1.2, 1.3 README.fedora.Gallery2, 1.2, 1.3 gallery2.spec, 1.4, 1.5 sources, 1.3, 1.4

[John Berninger (jwb)]

Author: jwb

Update of /cvs/extras/rpms/gallery2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21240

Modified Files:
	.cvsignore README.fedora.Gallery2 gallery2.spec sources 
Log Message:
update to upstream v 2.2 base and other changes


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gallery2/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jun 2006 03:51:38 -0000	1.2
+++ .cvsignore	7 May 2007 03:34:21 -0000	1.3
@@ -1 +1 @@
-gallery-2.1.svn.tar.gz
+gallery-2.2.svn.tar.gz


Index: README.fedora.Gallery2
===================================================================
RCS file: /cvs/extras/rpms/gallery2/FC-6/README.fedora.Gallery2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.fedora.Gallery2	7 Jun 2006 14:15:43 -0000	1.2
+++ README.fedora.Gallery2	7 May 2007 03:34:21 -0000	1.3
@@ -31,8 +31,29 @@
 
 Installation/setup
 ------------------
-If you have a read-only /usr partition, you must run through the initial setup
-via the web application with /usr writable immediately after installing
-Gallery2.  The installation will need to write out a config.php file with
-database store, image store, and other details.  We'll work on moving this file
-to another location so we don't run into this issue in the future.
+There are a few differences, mostly cosmetic between this package and the
+upstream distribution.  First, upstream normally puts the login.txt auth
+token and config.php file in the install directory.  This package moves 
+those files to /etc/gallery2 and creates symlinks to them in 
+/usr/share/gallery2.  This is done to accomodate a read-only /usr environment.
+
+During the actual installation process, the following differences between the
+instructions displayed and the actual installation environment will have to be
+observed:
+
+Step 1 (Authentication):  You will be asked to place the login.txt file in
+the gallery2 directory on your web server.  This file should be placed in 
+the /etc/gallery2/ directory instead.
+
+Step 3 (Installation type):  The "Standard installation" option will initally
+refer to /usr/share/gallery2 as the destination for the new gallery.  Please
+disregard this notice and refer to the note on step 4 below.
+
+Step 4 (Storage setup): The default selection for the image storage directory
+in this package is /srv/gallery2.  You must chose a directory that the web
+server can write to - if you have a read-only /usr directory tree, the
+storage directory must be outside that tree.
+
+Step 7 (Create config file): This step will tell you that the config file,
+config.php, has been written to the gallery2 directory.  It was actually
+written to /etc/gallery2.


Index: gallery2.spec
===================================================================
RCS file: /cvs/extras/rpms/gallery2/FC-6/gallery2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gallery2.spec	17 Aug 2006 21:15:33 -0000	1.4
+++ gallery2.spec	7 May 2007 03:34:21 -0000	1.5
@@ -1,16 +1,17 @@
 %define installprefix %{_datadir}
 %define g2datadir /srv/gallery2
+%define g2confdir %{_sysconfdir}/gallery2
 
 Summary: Customizable photo gallery web site
 URL: http://gallery.menalto.com
 Name: gallery2
-Version: 2.1
+Version: 2.2
 Group: Applications/Publishing
-Release: 0.24.svn20060817%{?dist}
+Release: 0.1.svn20070506%{?dist}
 License: GPL
-# Source0: http://dl.sf.net/gallery/gallery-2.1-developer.tar.gz
+# Source0: http://dl.sf.net/gallery/gallery-2.2-developer.tar.gz
 # Using SVN tarball for source to resolve provides issues sanely
-Source0: gallery-2.1.svn.tar.gz
+Source0: gallery-2.2.svn.tar.gz
 Source1: gallery2-httpd-conf
 Source2: gallery2-htaccess
 Source3: README.fedora.Gallery2
@@ -21,8 +22,6 @@
 BuildRequires: perl-String-CRC32, subversion
 
 Patch0: gallery2-perl-location.patch
-Patch1: gallery2-login-txt-path.patch
-Patch2: gallery2-config-path.patch
 
 %package albumselect
 Summary: Albumselect module for Gallery 2
@@ -69,6 +68,21 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
+%package digibug
+Summary: Digibug module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
+%package dynamicalbum
+Summary: Dynamicalbum module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
+%package ecard
+Summary: Ecard module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
 %package exif
 Summary: Exif module for Gallery 2
 Group: Applications/Publishing
@@ -79,6 +93,11 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
+%package flashvideo
+Summary: Flashvideo module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
 %package fotokasten
 Summary: Fotokasten module for Gallery 2
 Group: Applications/Publishing
@@ -100,6 +119,11 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
+%package httpauth
+Summary: Httpauth module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
 %package icons
 Summary: Icons module for Gallery 2
 Group: Applications/Publishing
@@ -121,6 +145,16 @@
 Requires: gallery2 = %{version}-%{release}, ImageMagick >= 4.0
 Provides: gallery2-graphics
 
+%package itemadd
+Summary: Itemadd module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
+%package keyalbum
+Summary: Keyalbum module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
 %package linkitem
 Summary: Linkitem module for Gallery 2
 Group: Applications/Publishing
@@ -141,11 +175,21 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
+%package mp3audio
+Summary: MP3 audio module for Gallery2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
 %package multilang
 Summary: Multilang module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
+%package multiroot
+Summary: Multiroot module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
 %package netpbm
 Summary: Netpbm module for Gallery 2
 Group: Applications/Publishing
@@ -222,6 +266,11 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
+%package replica
+Summary: Replica module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
 %package reupload
 Summary: Reupload module for Gallery 2
 Group: Applications/Publishing
@@ -302,11 +351,28 @@
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
+%package webdav
+Summary: Webdav module for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+
 %package zipcart
 Summary: Zipcart module for Gallery 2
 Group: Applications/Publishing
 Requires: gallery2 = %{version}-%{release}
 
+%package ajaxian
+Summary: Ajaxian theme for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+Provides: gallery2-display
+
+%package carbon
+Summary: Carbon theme for Gallery 2
+Group: Applications/Publishing
+Requires: gallery2 = %{version}-%{release}
+Provides: gallery2-display
+
 %package classic
 Summary: Classic theme for Gallery 2
 Group: Applications/Publishing
@@ -384,12 +450,24 @@
 %description debug
 Gallery 2 module - Debugging and Developer Tools
 
+%description digibug
+Gallery 2 module - Digibug module for Gallery2
+
+%description dynamicalbum
+Gallery 2 module - Dynamic album support
+
+%description ecard
+Gallery 2 module - Support for e-card albums
+
 %description exif
 Gallery 2 module - Extract EXIF/IPTC data from JPEG photos 
 
 %description ffmpeg
 Gallery 2 module - A toolkit for processing movies 
 
+%description flashvideo
+Gallery 2 module - Support for Flash videos
+
 %description fotokasten
 Gallery 2 module - fotokasten - CVS only
 
@@ -402,6 +480,9 @@
 %description hidden
 Gallery 2 module - hidden - CVS only
 
+%description httpauth
+Gallery 2 module - HTTP authentication
+
 %description icons
 Gallery 2 module - Display icons for links 
 
@@ -414,6 +495,12 @@
 %description imagemagick
 Gallery 2 module - ImageMagick / GraphicsMagick Graphics Toolkit
 
+%description itemadd
+Gallery 2 module - Item addition
+
+%description keyalbum
+Gallery 2 module - Key albums
+
 %description linkitem
 Gallery 2 module - CVS only
 
@@ -426,9 +513,15 @@
 %description mime
 Gallery 2 module - Maintain MIME types and file extensions 
 
+%description mp3audio
+Gallery 2 module - Support for MP3 audio files
+
 %description multilang
 Gallery 2 module - Support item captions in multiple languages
 
+%description multiroot
+Gallery 2 module - Support for multiroot galleries
+
 %description netpbm
 Gallery 2 module - NetPBM Graphics Toolkit
 
@@ -474,6 +567,9 @@
 %description remote
 Gallery 2 module - Implementation for the remote control protocol
 
+%description replica
+Gallery 2 module - Replication support
+
 %description reupload
 Gallery 2 module - reupload - CVS only
 
@@ -523,9 +619,18 @@
 %description webcam
 Gallery 2 module - Support periodically updated images like a webcam
 
+%description webdav
+Gallery 2 module - Support for the WebDAV protocol
+
 %description zipcart
 Gallery 2 module - Download cart items in a zip file
 
+%description ajaxian
+Gallery 2 theme - Ajaxian theme for Gallery 2
+
+%description carbon
+Gallery 2 theme - Carbon theme for Gallery 2
+
 %description classic
 Gallery 2 theme - Classic Gallery2 root album look and fee
 
@@ -551,7 +656,6 @@
 %prep
 %setup -q -n gallery2
 %patch0 -p1
-%patch1 -p1
 
 %build
 pushd lib/tools/bin
@@ -574,16 +678,21 @@
 install -m 0644 -p %{SOURCE2} ${RPM_BUILD_ROOT}%{installprefix}/gallery2/.htaccess
 cp -pr * ${RPM_BUILD_ROOT}%{installprefix}/gallery2
 install -m 0644 -p %{SOURCE3} ${RPM_BUILD_ROOT}%{installprefix}/gallery2/README.fedora
-echo "<?php /* This file intentionally empty - it is populated during Gallery's setup / configuration process*/ ?>" > ${RPM_BUILD_ROOT}%{installprefix}/gallery2/config.php
-chmod 644 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/config.php
 chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/po/premerge-messages.pl
 chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/po/update-all-translations.pl
 chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/bin/getIllegalFunctions.pl
 chmod 755 ${RPM_BUILD_ROOT}%{installprefix}/gallery2/lib/tools/uml/make-java-classes.pl
 mkdir -p ${RPM_BUILD_ROOT}%{g2datadir}
+mkdir -p ${RPM_BUILD_ROOT}%{g2confdir}
 # Touch a login.txt in /srv/gallery2/ and ghost it so we don't
 # run afoul of a ro /usr
-touch ${RPM_BUILD_ROOT}%{g2datadir}/login.txt
+touch ${RPM_BUILD_ROOT}%{g2confdir}/login.txt
+ln -s ../../..%{g2confdir}/login.txt ${RPM_BUILD_ROOT}%{installprefix}/gallery2/login.txt
+echo "<?php /* This file intentionally empty - it is populated during Gallery's setup / configuration process*/ " > ${RPM_BUILD_ROOT}%{g2confdir}/config.php
+echo "\$gallery->setConfig('data.gallery.base', '/srv/gallery2');" >> ${RPM_BUILD_ROOT}%{g2confdir}/config.php
+echo "?>" >> ${RPM_BUILD_ROOT}%{g2confdir}/config.php
+ln -s ../../..%{g2confdir}/config.php ${RPM_BUILD_ROOT}%{installprefix}/gallery2/config.php
+chmod 644 ${RPM_BUILD_ROOT}%{g2confdir}/config.php
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -592,11 +701,13 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/bootstrap.inc
 %{installprefix}/gallery2/embed.php
+%{installprefix}/gallery2/config.php
 %{installprefix}/gallery2/images/
 %{installprefix}/gallery2/index.php
 %{installprefix}/gallery2/init.inc
 %{installprefix}/gallery2/install/
 %{installprefix}/gallery2/lib/
+%{installprefix}/gallery2/login.txt
 %{installprefix}/gallery2/main.php
 %dir %{installprefix}/gallery2
 %dir %{installprefix}/gallery2/modules
@@ -608,9 +719,10 @@
 %doc %{installprefix}/gallery2/MANIFEST
 %doc %{installprefix}/gallery2/README.html
 %doc %{installprefix}/gallery2/README.fedora
-%attr(-,apache,root) %config(noreplace) %{installprefix}/gallery2/config.php
+%attr(-,apache,root) %config(noreplace) %{g2confdir}/config.php
 %config(noreplace) %{installprefix}/gallery2/.htaccess
-%ghost %{g2datadir}/login.txt
+%dir %{g2confdir}
+%config(noreplace) %{g2confdir}/login.txt
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/gallery2.conf
 
 %files albumselect
@@ -649,6 +761,18 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/debug/
 
+%files digibug
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/digibug/
+
+%files dynamicalbum
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/dynamicalbum/
+
+%files ecard
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/ecard/
+
 %files exif
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/exif/
@@ -657,6 +781,10 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/ffmpeg/
 
+%files flashvideo
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/flashvideo/
+
 %files fotokasten
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/fotokasten/
@@ -673,6 +801,10 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/hidden/
 
+%files httpauth
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/httpauth/
+
 %files icons
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/icons/
@@ -693,6 +825,14 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/linkitem/
 
+%files itemadd
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/itemadd/
+
+%files keyalbum
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/keyalbum/
+
 %files members
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/members/
@@ -705,10 +845,18 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/mime/
 
+%files mp3audio
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/mp3audio/
+
 %files multilang
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/multilang/
 
+%files multiroot
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/multiroot/
+
 %files netpbm
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/netpbm/
@@ -769,6 +917,10 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/remote/
 
+%files replica
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/replica/
+
 %files reupload
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/reupload/
@@ -833,10 +985,22 @@
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/webcam/
 
+%files webdav
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/modules/webdav/
+
 %files zipcart
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/modules/zipcart/
 
+%files ajaxian
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/themes/ajaxian/
+
+%files carbon
+%defattr(-,root,root,-)
+%{installprefix}/gallery2/themes/carbon/
+
 %files classic
 %defattr(-,root,root,-)
 %{installprefix}/gallery2/themes/classic/
@@ -866,6 +1030,12 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Sun May  6 2007 John Berninger <johnw at berningeronline dot net> - 2.2-0.1.svn20070506
+- Switch to upstream ver 2.2 base
+- Add digibug, dynamicalbum, ecard, flashvideo, httpauth, itemadd, keyalbum, mp3audio, multiroot, replica, webdav modules
+- Add ajaxian, carbon themes
+- Refactor login.txt and config.php references, update readme for same
+
 * Thu Aug 17 2006 John Berninger <johnw at berningeronline dot net> - 2.1-0.24.svn20060817
 - Update to HEAD snapshot for 2.1.2 releases which fixes security vulnerabilities upstream
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gallery2/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Aug 2006 21:15:33 -0000	1.3
+++ sources	7 May 2007 03:34:21 -0000	1.4
@@ -1 +1 @@
-7a94729fcd58f386dc5637de30b159a9  gallery-2.1.svn.tar.gz
+b5f7de33658d0a74adf880fc6c013eb0  gallery-2.2.svn.tar.gz