diff options
| -rw-r--r-- | postgresql.init | 21 | ||||
| -rwxr-xr-x | postgresql.spec | 83 |
2 files changed, 74 insertions, 30 deletions
diff --git a/postgresql.init b/postgresql.init index 4beaefc..29ed5de 100644 --- a/postgresql.init +++ b/postgresql.init @@ -153,23 +153,12 @@ start(){ pid=`pidof -s postmaster` if [ $pid ] then - if echo "$TYPESET"|grep "declare -f success ()" >/dev/null - then - success "$PSQL_START" - else - echo " [ OK ]" - fi - touch /var/lock/subsys/postgresql - echo $pid > /var/run/postmaster.pid - echo + success "$PSQL_START" + touch /var/lock/subsys/postgresql + echo $pid > /var/run/postmaster.pid + echo else - if echo "$TYPESET"|grep "declare -f failure ()" >/dev/null - then - failure "$PSQL_START" - else - echo " [ FAILED ]" - fi - echo + failure "$PSQL_START" fi fi } diff --git a/postgresql.spec b/postgresql.spec index 99ee1b9..cc362bd 100755 --- a/postgresql.spec +++ b/postgresql.spec @@ -3,7 +3,7 @@ %{?beta:%define __os_install_post /usr/lib/rpm/brp-compress} %{!?perl:%define perl 1} %{!?tcl:%define tcl 1} -%{!?tkpkg:%define tkpkg 1} +%{!?tkpkg:%define tkpkg 0} %{!?odbc:%define odbc 1} %{!?jdbc:%define jdbc 1} %{!?test:%define test 0} @@ -16,10 +16,12 @@ %{!?kerberos:%define kerberos 1} %{!?nls:%define nls 1} %{!?pam:%define pam 1} +%{!?sgmldocs:%define sgmldocs 0} + # Utility feature defines. %{!?enable_mb:%define enable_mb 1} -%{!?pgaccess:%define pgaccess 1} +%{!?pgaccess:%define pgaccess 0} # Python major version. %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')%{nil}} @@ -49,7 +51,7 @@ Version: 7.2.1 # Pre-release RPM's should not be put up on the public ftp.postgresql.org server # -- only test releases or full releases should be. -Release: 5 +Release: 15 License: BSD Group: Applications/Databases Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz @@ -58,15 +60,16 @@ Source4: file-lists.tar.gz Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz.md5 Source6: README.rpm-dist Source7: migration-scripts.tar.gz -Source8: http://jdbc.postgresql.org/download/jdbc7.2dev-1.1.jar -Source9: http://jdbc.postgresql.org/download/jdbc7.2dev-1.2.jar -Source10: http://jdbc.postgresql.org/download/jdbc7.1-1.1.jar -Source11: http://jdbc.postgresql.org/download/jdbc7.1-1.2.jar +Source8: http://jdbc.postgresql.org/download/devpgjdbc1.jar +Source9: http://jdbc.postgresql.org/download/devpgjdbc2.jar +Source10: http://jdbc.postgresql.org/download/pgjdbc1.jar +Source11: http://jdbc.postgresql.org/download/pgjdbc2.jar Source12: postgresql-dump.1.gz Source15: postgresql-bashprofile Patch1: rpm-pgsql-7.2.patch Patch3: postgresql-7.2rc2-betterquote.patch Patch4: postgresql-7.2-tighten.patch +Patch5: postgresql-7.2.1-mktime.patch Buildrequires: perl glibc-devel Prereq: /sbin/ldconfig initscripts BuildPrereq: perl @@ -117,10 +120,15 @@ Obsoletes: postgresql-jdbc %if ! %{test} Obsoletes: postgresql-test %endif +%if ! %{sgmldocs} +Obsoletes: postgresql-docs +%endif %if %{pam} BuildRequires: pam-devel %endif + + # This is the PostgreSQL Global Development Group Official RPMset spec file, # or a derivative thereof. # Copyright 2001 Lamar Owen <lamar@postgresql.org> <lamar.owen@wgcr.org> @@ -182,6 +190,8 @@ Prereq: /usr/sbin/useradd /sbin/chkconfig Requires: postgresql = %{version} libpq.so Requires: postgresql-libs = %{version} +#------------ +%if %sgmldocs %package docs Summary: Extra documentation for PostgreSQL Group: Applications/Databases @@ -190,6 +200,8 @@ The postgresql-docs package includes the SGML source for the documentation as well as the documentation in other formats, and some extra documentation. Install this package if you want to help with the PostgreSQL documentation project, or if you want to generate printed documentation. +%endif + %package contrib Summary: Contributed source and binaries distributed with PostgreSQL @@ -339,6 +351,10 @@ system, including regression tests and benchmarks. #patch2 -p1 #patch3 -p1 %patch4 -p1 +%patch5 -p1 + +#binary +rm contrib/spi/preprocessor/step1.e %build @@ -402,8 +418,10 @@ CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100` --includedir=%{_includedir} \ --datadir=/usr/share/pgsql + make all + %if %test pushd src/test make all @@ -416,7 +434,7 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %if %perl - make PREFIX=$RPM_BUILD_ROOT/usr -C src/interfaces/perl5 -f Makefile install + make DESTDIR=$RPM_BUILD_ROOT -C src/interfaces/perl5 -f Makefile install # Get rid of the packing list generated by the perl Makefile, and build my own... find $RPM_BUILD_ROOT/usr/lib/perl5 -name .packlist -exec rm -f {} \; @@ -430,7 +448,7 @@ make DESTDIR=$RPM_BUILD_ROOT install if [ ! -e $RPM_BUILD_ROOT%{_mandir}/man3/Pg.* ] then mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 - cp `find $RPM_BUILD_ROOT -name 'Pg.3*' -print` $RPM_BUILD_ROOT%{_mandir}/man3 + cp src/interfaces/perl5/blib/man3/Pg.3pm $RPM_BUILD_ROOT%{_mandir}/man3 fi pushd src/interfaces @@ -808,9 +826,12 @@ rm -f perlfiles.list %{_mandir}/man1/vacuumdb.1* %{_mandir}/man7/* + +%if %sgmldocs %files docs %defattr(-,root,root) %doc doc/src/* +%endif %files contrib %defattr(-,root,root) @@ -866,7 +887,7 @@ rm -f perlfiles.list /usr/lib/libecpg.a /usr/lib/libpq++.a /usr/lib/libpgeasy.a -%if tcl +%if %tcl /usr/lib/libpgtcl.a %endif %{_mandir}/man1/ecpg.1* @@ -928,10 +949,7 @@ rm -f perlfiles.list %if %jdbc %files jdbc %defattr(-,root,root) -/usr/share/pgsql/jdbc7.1-1.1.jar -/usr/share/pgsql/jdbc7.1-1.2.jar -/usr/share/pgsql/jdbc7.2dev-1.1.jar -/usr/share/pgsql/jdbc7.2dev-1.2.jar +/usr/share/pgsql/*jar %endif %if %test @@ -942,6 +960,43 @@ rm -f perlfiles.list %endif %changelog +* Fri Aug 9 2002 Trond Eivind Glomsrød <teg@redhat.com> 7.2.1-15 +- Minor initscript tweak ( #71027) + +* Tue Jul 23 2002 Tim Powers <timp@redhat.com> 7.2.1-14 +- build using gcc-3.2-0.1 + +* Thu Jul 11 2002 Trond Eivind Glomsrød <teg@redhat.com> 7.2.1-13 +- Rebuild with new readline + +* Mon Jul 8 2002 Trond Eivind Glomsrød <teg@redhat.com> 7.2.1-12 +- Update the jarfiles from jdbc.postgresql.org + +* Wed Jul 3 2002 Trond Eivind Glomsrød <teg@redhat.com> 7.2.1-11 +- Make postgresql-docs conditional +- don't ship it - it's just sgml sources for docs in the main package + (#67818) + +* Fri Jun 21 2002 Tim Powers <timp@redhat.com> +- automated rebuild + +* Tue Jun 18 2002 Trond Eivind Glomsrød <teg@redhat.com> 7.2.1-10 +- step1.e was distributed as a binary... make sure it's rebuilt (#66870) + +* Wed Jun 12 2002 Trond Eivind Glomsrød <teg@redhat.com> 7.2.1-9 +- Make the perl parts build with new perl +- Fix mktime() usage - don't use it before the epoch +- Disable tk/pgaccess + +* Thu May 23 2002 Tim Powers <timp@redhat.com> +- automated rebuild + +* Tue May 7 2002 Trond Eivind Glomsrød <teg@redhat.com> 7.2.1-7 +- Rebuild + +* Mon Apr 22 2002 Trond Eivind Glomsrød <teg@redhat.com> 7.2.1-6 +- Add a missing percent in a conditional (tcl, devel package) + * Fri Apr 12 2002 Trond Eivind Glomsrød <teg@redhat.com> 7.2.1-5 - Fix conditional build dependencies... it required tcl and python-devel only when you didn't build the modules, |