rpms/postgresql
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to PyGreSQL 3.6 (to fix bug #142711). Adjust a few file permissions

Browse Source 
(bug #142431). Assign %{_libdir}/pgsql to base package instead of
    -server (bug #74003).
This commit is contained in:
Tom Lane 2004-12-16 22:02:42 +00:00
parent be132bc359
commit ec364abd8a
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1,2 +1,2 @@
PyGreSQL-3.5.tgz
postgresql-7.4.6.tar.bz2 postgresql-7.4.6.tar.bz2
PyGreSQL-3.6.tgz

31
postgresql.spec
View File

@ -67,7 +67,7 @@ Version: 7.4.6
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server # Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be. # -- only test releases or full releases should be.
Release: 2 Release: 3
License: BSD License: BSD
Group: Applications/Databases Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@ -80,7 +80,7 @@ Source10: http://jdbc.postgresql.org/download/pg74.215.jdbc2ee.jar
Source11: http://jdbc.postgresql.org/download/pg74.215.jdbc3.jar Source11: http://jdbc.postgresql.org/download/pg74.215.jdbc3.jar
Source15: postgresql-bashprofile Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh Source16: filter-requires-perl-Pg.sh
Source18: ftp://ftp.druid.net/pub/distrib/PyGreSQL-3.5.tgz Source18: ftp://ftp.druid.net/pub/distrib/PyGreSQL-3.6.tgz
Patch1: rpm-pgsql-7.4.patch Patch1: rpm-pgsql-7.4.patch
Patch2: rpm-multilib-%{version}.patch Patch2: rpm-multilib-%{version}.patch
Patch3: postgresql-7.4-tighten.patch Patch3: postgresql-7.4-tighten.patch
@ -353,9 +353,11 @@ popd
tar xzf %{SOURCE18} tar xzf %{SOURCE18}
PYGRESQLDIR=`basename %{SOURCE18} .tgz` PYGRESQLDIR=`basename %{SOURCE18} .tgz`
mv $PYGRESQLDIR PyGreSQL mv $PYGRESQLDIR PyGreSQL
# Some versions of PyGreSQL.tgz contain wrong permissions for docs files # Some versions of PyGreSQL.tgz contain wrong file permissions
chmod 644 PyGreSQL/Announce PyGreSQL/ChangeLog PyGreSQL/README chmod 644 PyGreSQL/Announce PyGreSQL/ChangeLog PyGreSQL/README
chmod 755 PyGreSQL/tutorial PyGreSQL/tutorial/*.py chmod 755 PyGreSQL/tutorial
chmod 644 PyGreSQL/tutorial/*.py
chmod 755 PyGreSQL/tutorial/advanced.py PyGreSQL/tutorial/basics.py
%endif %endif
%build %build
@ -443,7 +445,7 @@ make -C contrib DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT install-all-headers make DESTDIR=$RPM_BUILD_ROOT install-all-headers
# copy over Makefile.global to the include dir.... # copy over Makefile.global to the include dir....
install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql install -m 644 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
%if %jdbc %if %jdbc
# Java/JDBC # Java/JDBC
@ -451,10 +453,10 @@ install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
# JDBC jars # JDBC jars
install -d $RPM_BUILD_ROOT/usr/share/java install -d $RPM_BUILD_ROOT/usr/share/java
install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/usr/share/java install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/usr/share/java
install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/usr/share/java install -m 644 %{SOURCE9} $RPM_BUILD_ROOT/usr/share/java
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/java install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/java
install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/share/java install -m 644 %{SOURCE11} $RPM_BUILD_ROOT/usr/share/java
%endif %endif
@ -509,8 +511,8 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pgtksh.*
pushd PyGreSQL pushd PyGreSQL
install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
install -m 0755 _pgmodule.so $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages install -m 0755 _pgmodule.so $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
install -m 0755 pg.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages install -m 0644 pg.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
install -m 0755 pgdb.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages install -m 0644 pgdb.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
popd popd
%endif %endif
@ -607,6 +609,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/psql.* %{_mandir}/man1/psql.*
%{_mandir}/man1/vacuumdb.* %{_mandir}/man1/vacuumdb.*
%{_mandir}/man7/* %{_mandir}/man7/*
%dir %{_libdir}/pgsql
%files docs %files docs
%defattr(-,root,root) %defattr(-,root,root)
@ -701,7 +704,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pgsql/postgres.description %{_datadir}/pgsql/postgres.description
%{_datadir}/pgsql/*.sample %{_datadir}/pgsql/*.sample
%{_libdir}/pgsql/plpgsql.so %{_libdir}/pgsql/plpgsql.so
%dir %{_libdir}/pgsql
%dir %{_datadir}/pgsql %dir %{_datadir}/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql %attr(700,postgres,postgres) %dir /var/lib/pgsql
%attr(700,postgres,postgres) %dir /var/lib/pgsql/data %attr(700,postgres,postgres) %dir /var/lib/pgsql/data
@ -788,6 +790,11 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Thu Dec 16 2004 Tom Lane <tgl@redhat.com> 7.4.6-3
- Update to PyGreSQL 3.6 (to fix bug #142711)
- Adjust a few file permissions (bug #142431)
- Assign %%{_libdir}/pgsql to base package instead of -server (bug #74003)
* Mon Nov 15 2004 Tom Lane <tgl@redhat.com> 7.4.6-2 * Mon Nov 15 2004 Tom Lane <tgl@redhat.com> 7.4.6-2
- Rebuild so python components play with python 2.4 (bug 139160) - Rebuild so python components play with python 2.4 (bug 139160)

2
sources
View File

@ -1,2 +1,2 @@
aec4cc8600af25b1fe895f2ee6cd9801 PyGreSQL-3.5.tgz
f0ea2b372a7bdaf2613e92176ebf5e0f postgresql-7.4.6.tar.bz2 f0ea2b372a7bdaf2613e92176ebf5e0f postgresql-7.4.6.tar.bz2
3857df12291f7fad3cce553f05d97f4a PyGreSQL-3.6.tgz