diff --git a/.gitignore b/.gitignore index 04124b1..616ecb4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/postgresql-9.3.5.tar.bz2 +/postgresql-9.4.0.tar.bz2 diff --git a/mingw-postgresql.spec b/mingw-postgresql.spec index f777ecd..32c6692 100644 --- a/mingw-postgresql.spec +++ b/mingw-postgresql.spec @@ -1,16 +1,16 @@ %?mingw_package_header Name: mingw-postgresql -Version: 9.3.5 +Version: 9.4.0 Release: 1%{?dist} Summary: MinGW Windows PostgreSQL library License: PostgreSQL URL: http://www.postgresql.org/ -Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 +Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 -# DLL Linking of libplpgsql.dll fails -Patch0: postgresql-9.3.5-plpgsql-link.patch +# Allow linking to MinGW TCL DLL +Patch0: postgresql-9.4.0-mingw.patch BuildArch: noarch @@ -64,7 +64,7 @@ database management system (DBMS). %prep %setup -q -n postgresql-%{version} -%patch0 -p0 +%patch0 -p1 %build @@ -119,10 +119,6 @@ rm $RPM_BUILD_ROOT%{mingw64_bindir}/*.exe rm -rf $RPM_BUILD_ROOT%{mingw32_libdir}/postgresql/ rm -rf $RPM_BUILD_ROOT%{mingw64_libdir}/postgresql/ -# remove Event Log DLL, only useful for server -rm $RPM_BUILD_ROOT%{mingw32_bindir}/pgevent.dll -rm $RPM_BUILD_ROOT%{mingw64_bindir}/pgevent.dll - # remove server support files rm -rf $RPM_BUILD_ROOT%{mingw32_bindir}/pltcl* rm -rf $RPM_BUILD_ROOT%{mingw64_bindir}/pltcl* @@ -149,7 +145,7 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/libpq.a $RPM_BUILD_ROOT%{mingw64_libdir}/lib # Win32 %files -n mingw32-postgresql -%doc COPYRIGHT +%license COPYRIGHT %{mingw32_bindir}/libecpg.dll %{mingw32_bindir}/libecpg_compat.dll %{mingw32_bindir}/libpgtypes.dll @@ -173,7 +169,7 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/libpq.a $RPM_BUILD_ROOT%{mingw64_libdir}/lib # Win64 %files -n mingw64-postgresql -%doc COPYRIGHT +%license COPYRIGHT %{mingw64_bindir}/libecpg.dll %{mingw64_bindir}/libecpg_compat.dll %{mingw64_bindir}/libpgtypes.dll @@ -196,6 +192,9 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/libpq.a $RPM_BUILD_ROOT%{mingw64_libdir}/lib %changelog +* Tue Feb 03 2015 Michael Cronenworth - 9.4.0-1 +- New upstream release. + * Sat Aug 16 2014 Michael Cronenworth - 9.3.5-1 - New upstream release. diff --git a/postgresql-9.3.5-plpgsql-link.patch b/postgresql-9.3.5-plpgsql-link.patch deleted file mode 100644 index dfee468..0000000 --- a/postgresql-9.3.5-plpgsql-link.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/pl/plpgsql/src/Makefile.orig 2014-07-21 14:10:42.000000000 -0500 -+++ src/pl/plpgsql/src/Makefile 2014-08-16 21:21:43.303005362 -0500 -@@ -14,7 +14,7 @@ - NAME= plpgsql - - override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) --SHLIB_LINK = $(filter -lintl, $(LIBS)) -+SHLIB_LINK = $(filter -lintl, $(LIBS)) ../../../../src/backend/access/common/heaptuple.o ../../../../src/backend/access/heap/tuptoaster.o ../../../../src/backend/executor/execTuples.o - rpath = - - OBJS = pl_gram.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o pl_scanner.o diff --git a/postgresql-9.4.0-mingw.patch b/postgresql-9.4.0-mingw.patch new file mode 100644 index 0000000..3a60418 --- /dev/null +++ b/postgresql-9.4.0-mingw.patch @@ -0,0 +1,38 @@ +--- postgresql-9.4.0/src/pl/tcl/Makefile.orig 2014-12-15 19:07:34.000000000 -0600 ++++ postgresql-9.4.0/src/pl/tcl/Makefile 2015-02-03 09:09:31.504321466 -0600 +@@ -32,6 +32,10 @@ + # On Windows, we don't link directly with the Tcl library; see below + ifneq ($(PORTNAME), win32) + SHLIB_LINK = $(TCL_LIB_SPEC) $(TCL_LIBS) -lc ++else ++ifeq ($(host_os), mingw32) ++SHLIB_LINK = $(TCL_LIB_SPEC) $(TCL_LIBS) ++endif + endif + + +@@ -51,6 +55,7 @@ + # which are not compatible with mingw gcc. Therefore we need to build a + # new import library to link with. + ifeq ($(PORTNAME), win32) ++ifneq ($(host_os), mingw32) + + tclwithver = $(subst -l,,$(filter -l%, $(TCL_LIB_SPEC))) + TCLDLL = $(dir $(TCLSH))/$(tclwithver).dll +@@ -63,6 +68,7 @@ + $(tclwithver).def: $(TCLDLL) + pexports $^ > $@ + ++endif # mingw32 + endif # win32 + + +@@ -117,6 +123,8 @@ + rm -f $(OBJS) + rm -rf $(pg_regress_clean_files) + ifeq ($(PORTNAME), win32) ++ifneq ($(host_os), mingw32) + rm -f $(tclwithver).def + endif ++endif + $(MAKE) -C modules $@ diff --git a/sources b/sources index b8178ff..c66c147 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5059857c7d7e6ad83b6d55893a121b59 postgresql-9.3.5.tar.bz2 +8cd6e33e1f8d4d2362c8c08bd0e8802b postgresql-9.4.0.tar.bz2