- upgraded to 5.0.2

[packages/phpPgAdmin.git] / phpPgAdmin.spec

diff --git a/phpPgAdmin.spec b/phpPgAdmin.spec
index 976d12d5aff7fb69b2caaa23faf64e2fe6e80db3..d60c368a22356be13d4ab22d360af32f702ee13c 100644 (file)
--- a/phpPgAdmin.spec
+++ b/phpPgAdmin.spec
@@ -4,24 +4,28 @@
 Summary:       phpPgAdmin - web-based PostgreSQL administration
 Summary(pl.UTF-8):     phpPgAdmin - administracja bazami PostgreSQL przez WWW
 Name:          phpPgAdmin
-Version:       4.1.3
+Version:       5.0.2
 Release:       1
 License:       GPL v2+
 Group:         Applications/Databases/Interfaces
 Source0:       http://dl.sourceforge.net/phppgadmin/%{name}-%{version}.tar.bz2
-# Source0-md5: a83d2be9a583d27e4915ca4881b339bf
+# Source0-md5: 4e4d462100ed602d4f6c9b47b1586aba
 Source1:       %{name}-apache.conf
+Source2:       %{name}-lighttpd.conf
+Source3:       http://www.quarto.pl/~gotar/%{name}-jscalendar.tar.bz2
+# Source3-md5: 84115f772a723cc742352c589df9af29
 Patch0:                %{name}-config.patch
-Patch1:                %{name}-alter-db.patch
 #Patch1:       %{name}-adodb.patch
+Patch2:                %{name}-calendar.patch
 URL:           http://phppgadmin.sourceforge.net/
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires(triggerpostun):       sed >= 4.0
 #Requires:     adodb >= 4.67-1.17
 Requires:      php(pcre)
 Requires:      php(pgsql)
+Requires:      php(session)
 Requires:      webapps
-Requires:      webserver(php) >= 4.1
+Requires:      webserver(php) >= 5.0
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,7 +38,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 phpPgAdmin is a fully functional web-based administration utility for
 a PostgreSQL database server. It handles all the basic functionality
 as well as some advanced features such as triggers, views and
-functions (stored procs).
+functions (stored procedures).
 
 %description -l pl.UTF-8
 phpPgAdmin jest w pełni funkcjonalnym, bazowanym na WWW, narzędziem
@@ -43,11 +47,12 @@ podstawowe możliwości, jak i część bardziej zaawansowanych jak
 przełączniki, widoki i funkcje (procedury składowane).
 
 %prep
-%setup -q
+%setup -q -a3
 %patch0 -p1
-%patch1 -p0
 #%patch1 -p1
-rm -f conf/config.inc.php-dist
+%patch2 -p1
+mv conf/config.inc.php{-dist,}
+find . -name \*.orig -exec rm -f \{\} \;
 
 # remove language source files (or one wants to make -devel subpackage?)
 mv -f lang/translations.php .
@@ -61,12 +66,12 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir}}
 
 cp -a *.php *.txt *.js $RPM_BUILD_ROOT%{_appdir}
-cp -a classes help images lang libraries themes xloadtree $RPM_BUILD_ROOT%{_appdir}
+cp -a classes help images js lang libraries themes xloadtree $RPM_BUILD_ROOT%{_appdir}
 cp -a conf/*.php $RPM_BUILD_ROOT%{_sysconfdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-#install lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %triggerin -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
@@ -80,11 +85,11 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 %triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
-#%%triggerin -- lighttpd
-#%%webapp_register lighttpd %{_webapp}
-#
-#%%triggerun -- lighttpd
-#%%webapp_unregister lighttpd %{_webapp}
+%triggerin -- lighttpd
+%webapp_register lighttpd %{_webapp}
+
+%triggerun -- lighttpd
+%webapp_unregister lighttpd %{_webapp}
 
 %triggerpostun -- %{name} < 4.0.1-1.2
 # rescue app config
@@ -157,7 +162,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %attr(750,root,http) %{_sysconfdir}
 %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,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.php
 
 %{_appdir}