- don't package config.php twice

[packages/gallery.git] / gallery.spec

diff --git a/gallery.spec b/gallery.spec
index be03e4bbbd8733d533b6c062c4648e5d99150402..f7355d6659a15af74c8bee9c6f584980a60af10f 100644 (file)
--- a/gallery.spec
+++ b/gallery.spec
@@ -2,25 +2,30 @@
 # - use external libs, not the included ones: pear, smarty, adodb
 # - move to separate packages each: theme, module.
 Summary:       Web based photo album viewer and creator
 # - use external libs, not the included ones: pear, smarty, adodb
 # - move to separate packages each: theme, module.
 Summary:       Web based photo album viewer and creator

-Summary(pl):   Przegl±darka i generator albumów zdjêæ w postaci stron WWW
+Summary(pl.UTF-8):     Przeglądarka i generator albumów zdjęć w postaci stron WWW

 Name:          gallery
 Name:          gallery

-Version:       2.1.1a
-Release:       1
+Version:       2.3
+Release:       3

 License:       GPL
 Group:         Applications/Publishing
 Source0:       http://dl.sourceforge.net/gallery/%{name}-%{version}-full.tar.gz
 License:       GPL
 Group:         Applications/Publishing
 Source0:       http://dl.sourceforge.net/gallery/%{name}-%{version}-full.tar.gz

-# Source0-md5: 0ff0857716a1473c319b6a468c47c877
+# Source0-md5: f85663db5f1de99d0b3bc13929f9ab39
+#Source0:      http://galleryupdates.jpmullan.com/G2/%{name}-nightly.tar.gz

 Source1:       %{name}-apache.conf
 Source1:       %{name}-apache.conf

+Source2:       %{name}-lighttpd.conf
+Source3:       %{name}-httpd.conf
+Patch0:                %{name}-setup.patch

 URL:           http://gallery.sourceforge.net/
 BuildRequires: rpmbuild(macros) >= 1.268
 URL:           http://gallery.sourceforge.net/
 BuildRequires: rpmbuild(macros) >= 1.268

+Requires:      php(gettext)
+Requires:      php(pcre)

 Requires:      webapps
 Requires:      webapps

-Requires:      php-gettext
-Requires:      php-pcre
-Requires:      php >= 3:4.1.0
+Requires:      webserver(php) >= 4.1.0

 #Suggests:     apache(mod_rewrite)
 #Suggests:     jhead
 #Suggests:     jpegtran
 #Suggests:     php-gd
 #Suggests:     apache(mod_rewrite)
 #Suggests:     jhead
 #Suggests:     jpegtran
 #Suggests:     php-gd

+Conflicts:     apache-base < 2.4.0-1

 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -36,31 +41,33 @@ management includes automatic thumbnail creation, image resizing,
 rotation, ordering and more. Albums can have read, write, and caption
 permissions per individual.
 
 rotation, ordering and more. Albums can have read, write, and caption
 permissions per individual.
 

-%description -l pl
-Gallery jest albumem zdjêæ, który posiadaj kreatora konfiguracji i
-pozwala u¿ytkownikom tworzyæ i zarz±dzaæ albumami przez intuicyjny
-interfejs WWW. Zarz±dzanie zdjêciami umo¿liwia automatyczne tworzenie
-miniatur, zmianê wielko¶ci obrazów, obrót, zmianê kolejno¶ci
-wy¶wietlania, itp. Albumy mog± posiadaæ indywidualne uprawnienia.
+%description -l pl.UTF-8
+Gallery jest albumem zdjęć, który posiadaj kreatora konfiguracji i
+pozwala użytkownikom tworzyć i zarządzać albumami przez intuicyjny
+interfejs WWW. Zarządzanie zdjęciami umożliwia automatyczne tworzenie
+miniatur, zmianę wielkości obrazów, obrót, zmianę kolejności
+wyświetlania, itp. Albumy mogą posiadać indywidualne uprawnienia.

 
 %package setup
 Summary:       Gallery setup package
 
 %package setup
 Summary:       Gallery setup package

-Summary(pl):   Pakiet do wstêpnej konfiguracji Gallery
+Summary(pl.UTF-8):     Pakiet do wstępnej konfiguracji Gallery

 Group:         Applications/WWW
 Requires:      %{name} = %{version}-%{release}
 Group:         Applications/WWW
 Requires:      %{name} = %{version}-%{release}

+Conflicts:     external-gallery-module

 
 %description setup
 Install this package to configure initial Gallery installation. You
 should uninstall this package when you're done, as it considered
 insecure to keep the setup files in place.
 
 
 %description setup
 Install this package to configure initial Gallery installation. You
 should uninstall this package when you're done, as it considered
 insecure to keep the setup files in place.
 

-%description setup -l pl
-Ten pakiet nale¿y zainstalowaæ w celu wstêpnej konfiguracji Gallery po
-pierwszej instalacji. Potem nale¿y go odinstalowaæ, jako ¿e
-pozostawienie plików instalacyjnych mog³oby byæ niebezpieczne.
+%description setup -l pl.UTF-8
+Ten pakiet należy zainstalować w celu wstępnej konfiguracji Gallery po
+pierwszej instalacji. Potem należy go odinstalować, jako że
+pozostawienie plików instalacyjnych mogłoby być niebezpieczne.

 
 %prep
 %setup -q -n %{name}2
 
 %prep
 %setup -q -n %{name}2

+%patch0 -p0

 
 rm -f LICENSE.txt *.bat
 
 
 rm -f LICENSE.txt *.bat
 


@@ -69,34 +76,44 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir},/var/lib/gallery/albums}
 
 cp -a *.{php,inc} $RPM_BUILD_ROOT%{_appdir}
 install -d $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir},/var/lib/gallery/albums}
 
 cp -a *.{php,inc} $RPM_BUILD_ROOT%{_appdir}

+cp README.html $RPM_BUILD_ROOT%{_appdir}

 cp -a images lib modules themes $RPM_BUILD_ROOT%{_appdir}
 cp -a install upgrade $RPM_BUILD_ROOT%{_appdir}
 cp -a images lib modules themes $RPM_BUILD_ROOT%{_appdir}
 cp -a install upgrade $RPM_BUILD_ROOT%{_appdir}

-# in /var because of setup/resetadmin file
-#cp -a setup $RPM_BUILD_ROOT/var/lib/gallery
-#ln -s /var/lib/gallery/setup $RPM_BUILD_ROOT%{_appdir}

 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf

-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf

 touch $RPM_BUILD_ROOT%{_sysconfdir}/config.php
 touch $RPM_BUILD_ROOT%{_sysconfdir}/login.txt
 ln -s %{_sysconfdir}/config.php $RPM_BUILD_ROOT%{_appdir}/config.php
 ln -s %{_sysconfdir}/login.txt $RPM_BUILD_ROOT%{_appdir}/login.txt
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/config.php
 touch $RPM_BUILD_ROOT%{_sysconfdir}/login.txt
 ln -s %{_sysconfdir}/config.php $RPM_BUILD_ROOT%{_appdir}/config.php
 ln -s %{_sysconfdir}/login.txt $RPM_BUILD_ROOT%{_appdir}/login.txt
 

+## Cleanup modules that are avaible in separate packages:
+#for module in exif; do
+#      rm -rf $RPM_BUILD_ROOT%{_appdir}/modules/$module
+#done
+

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%triggerin -- apache1
+%triggerin -- apache1 < 1.3.37-3, apache1-base

 %webapp_register apache %{_webapp}
 
 %webapp_register apache %{_webapp}
 

-%triggerun -- apache1
+%triggerun -- apache1 < 1.3.37-3, apache1-base

 %webapp_unregister apache %{_webapp}
 
 %webapp_unregister apache %{_webapp}
 

-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base

 %webapp_register httpd %{_webapp}
 
 %webapp_register httpd %{_webapp}
 

-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base

 %webapp_unregister httpd %{_webapp}
 
 %webapp_unregister httpd %{_webapp}
 

+%triggerin -- lighttpd
+%webapp_register lighttpd %{_webapp}
+
+%triggerun -- lighttpd
+%webapp_unregister lighttpd %{_webapp}
+

 %triggerpostun -- %{name} < 1.5.2-0.13
 /usr/sbin/webapp register httpd %{_webapp}
 %service -q httpd reload
 %triggerpostun -- %{name} < 1.5.2-0.13
 /usr/sbin/webapp register httpd %{_webapp}
 %service -q httpd reload


@@ -105,16 +122,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README*
 %dir %attr(750,root,http) %{_sysconfdir}
 %defattr(644,root,root,755)
 %doc README*
 %dir %attr(750,root,http) %{_sysconfdir}

+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/login.txt

 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf

+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf

 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config.php

-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/login.txt

 %dir %{_appdir}
 %dir /var/lib/gallery
 %dir %attr(770,root,http) /var/lib/gallery/albums
 %dir %{_appdir}
 %dir /var/lib/gallery
 %dir %attr(770,root,http) /var/lib/gallery/albums

+%{_appdir}/login.txt

 %{_appdir}/*.php
 %{_appdir}/*.inc
 %{_appdir}/*.php
 %{_appdir}/*.inc

-%{_appdir}/login.txt

 %{_appdir}/images
 %{_appdir}/lib
 %{_appdir}/modules
 %{_appdir}/images
 %{_appdir}/lib
 %{_appdir}/modules


@@ -122,7 +140,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files setup
 %defattr(644,root,root,755)
 
 %files setup
 %defattr(644,root,root,755)

-%{_appdir}/config.php
+%{_appdir}/README.html

 %{_appdir}/install
 %{_appdir}/upgrade
 %{_appdir}/install
 %{_appdir}/upgrade

-#/var/lib/gallery/setup