This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
53dd5978a4
commit
a66936c222
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon May 19 18:31:54 CEST 2008 - schwab@suse.de
|
||||
|
||||
- Fix broken configure check.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 10 14:23:15 CEST 2008 - max@suse.de
|
||||
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: postgresql-pl
|
||||
@ -18,12 +17,13 @@ BuildRequires: ncurses-devel
|
||||
BuildRequires: python-devel tcl-devel
|
||||
Summary: The PL/Tcl, PL/Perl, and PL/Python Procedural Languages for PostgreSQL
|
||||
Version: 8.3.1
|
||||
Release: 3
|
||||
Release: 4
|
||||
%define pg_minor_version %(echo %version | cut -f1-2 -d.)
|
||||
License: BSD 3-Clause
|
||||
Group: Productivity/Databases/Servers
|
||||
Source0: postgresql-%version.tar.bz2
|
||||
NoSource: 0
|
||||
Patch: postgresql-xslt.patch
|
||||
Url: http://www.postgresql.org/
|
||||
Requires: postgresql-server = %pg_minor_version
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -148,6 +148,7 @@ Authors:
|
||||
# The sources for the postgresql-pl package can be found
|
||||
# in the postgresql source RPM.
|
||||
%setup -q -n postgresql-%{version}
|
||||
%patch
|
||||
|
||||
%build
|
||||
export CFLAGS="%optflags $SP"
|
||||
@ -207,6 +208,8 @@ rm -rf %buildroot
|
||||
%_libdir/postgresql/plpython.so
|
||||
|
||||
%changelog
|
||||
* Mon May 19 2008 schwab@suse.de
|
||||
- Fix broken configure check.
|
||||
* Thu Apr 10 2008 max@suse.de
|
||||
- Adopt the 8.3.1 package from Peter Eisentraut's OBS project.
|
||||
- New features in PostgreSQL 8.3 include:
|
||||
|
||||
66
postgresql-xslt.patch
Normal file
66
postgresql-xslt.patch
Normal file
@ -0,0 +1,66 @@
|
||||
--- configure
|
||||
+++ configure
|
||||
@@ -7923,9 +7923,9 @@ fi
|
||||
|
||||
if test "$with_libxslt" = yes ; then
|
||||
|
||||
-echo "$as_me:$LINENO: checking for xsltLibxmlVersion in -lxslt" >&5
|
||||
-echo $ECHO_N "checking for xsltLibxmlVersion in -lxslt... $ECHO_C" >&6
|
||||
-if test "${ac_cv_lib_xslt_xsltLibxmlVersion+set}" = set; then
|
||||
+echo "$as_me:$LINENO: checking for xsltInit in -lxslt" >&5
|
||||
+echo $ECHO_N "checking for xsltInit in -lxslt... $ECHO_C" >&6
|
||||
+if test "${ac_cv_lib_xslt_xsltInit+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
@@ -7943,11 +7943,11 @@ extern "C"
|
||||
#endif
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
-char xsltLibxmlVersion ();
|
||||
+char xsltInit ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
-xsltLibxmlVersion ();
|
||||
+xsltInit ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
@@ -7974,20 +7974,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
- ac_cv_lib_xslt_xsltLibxmlVersion=yes
|
||||
+ ac_cv_lib_xslt_xsltInit=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
-ac_cv_lib_xslt_xsltLibxmlVersion=no
|
||||
+ac_cv_lib_xslt_xsltInit=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
-echo "$as_me:$LINENO: result: $ac_cv_lib_xslt_xsltLibxmlVersion" >&5
|
||||
-echo "${ECHO_T}$ac_cv_lib_xslt_xsltLibxmlVersion" >&6
|
||||
-if test $ac_cv_lib_xslt_xsltLibxmlVersion = yes; then
|
||||
+echo "$as_me:$LINENO: result: $ac_cv_lib_xslt_xsltInit" >&5
|
||||
+echo "${ECHO_T}$ac_cv_lib_xslt_xsltInit" >&6
|
||||
+if test $ac_cv_lib_xslt_xsltInit = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBXSLT 1
|
||||
_ACEOF
|
||||
--- configure.in
|
||||
+++ configure.in
|
||||
@@ -795,7 +795,7 @@ if test "$with_libxml" = yes ; then
|
||||
fi
|
||||
|
||||
if test "$with_libxslt" = yes ; then
|
||||
- AC_CHECK_LIB(xslt, xsltLibxmlVersion, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
|
||||
+ AC_CHECK_LIB(xslt, xsltInit, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
|
||||
fi
|
||||
|
||||
# for contrib/uuid-ossp
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon May 19 18:31:54 CEST 2008 - schwab@suse.de
|
||||
|
||||
- Fix broken configure check.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 9 10:25:15 CEST 2008 - aj@suse.de
|
||||
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: postgresql
|
||||
@ -17,7 +16,7 @@ BuildRequires: openldap2-devel openssl-devel pam-devel readline-devel zlib-deve
|
||||
BuildRequires: ncurses-devel
|
||||
Summary: Basic Clients and Utilities for PostgreSQL
|
||||
Version: 8.3.1
|
||||
Release: 8
|
||||
Release: 11
|
||||
%define pg_minor_version %(echo %version | cut -f1-2 -d.)
|
||||
License: BSD 3-Clause
|
||||
Group: Productivity/Databases/Tools
|
||||
@ -30,6 +29,7 @@ Source15: postgresql-bashprofile
|
||||
Source16: postgresql-firewall
|
||||
Source17: postgresql-rpmlintrc
|
||||
Source99: postgresql-pl.spec
|
||||
Patch: postgresql-xslt.patch
|
||||
Patch1: postgresql-8.3-conf.patch
|
||||
PreReq: postgresql-libs = %pg_minor_version
|
||||
Url: http://www.postgresql.org/
|
||||
@ -202,6 +202,8 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch
|
||||
%patch1
|
||||
|
||||
%build
|
||||
export CFLAGS="%optflags $SP"
|
||||
@ -251,11 +253,6 @@ make check || {
|
||||
%endif
|
||||
|
||||
%install
|
||||
#
|
||||
# The patch that changes postgresql.conf needs to be applied here,
|
||||
# because doing it before "make check" would break the test suite.
|
||||
#
|
||||
patch -p0 < %PATCH1
|
||||
make DESTDIR=%buildroot install
|
||||
# Don't ship static libraries.
|
||||
rm %buildroot/%_libdir/*.a
|
||||
@ -290,11 +287,9 @@ cp doc/FAQ doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README* COPYRIGHT \
|
||||
cp -a %SOURCE2 %buildroot%_docdir/postgresql/README.SuSE.de
|
||||
cp -a %SOURCE3 %buildroot%_docdir/postgresql/README.SuSE.en
|
||||
|
||||
%post libs
|
||||
%{?run_ldconfig:%run_ldconfig}
|
||||
%post libs -p /sbin/ldconfig
|
||||
|
||||
%postun libs
|
||||
%{?run_ldconfig:%run_ldconfig}
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%post server
|
||||
%{?fillup_and_insserv:%fillup_and_insserv -s postgresql START_POSTGRES}
|
||||
@ -451,6 +446,8 @@ rm -f %my_provides
|
||||
%doc %_mandir/man1/pg_config.1*
|
||||
|
||||
%changelog
|
||||
* Mon May 19 2008 schwab@suse.de
|
||||
- Fix broken configure check.
|
||||
* Fri May 09 2008 aj@suse.de
|
||||
- Add baselibs.conf.
|
||||
* Fri Apr 18 2008 max@suse.de
|
||||
|
||||
Loading…
Reference in New Issue
Block a user