rpms/postgresql-odbcng/F-10 postgresql-odbcng-0.99.101-debugpkg.patch, NONE, 1.1 postgresql-odbcng.spec, 1.3, 1.4

Michael Schwendt mschwendt at fedoraproject.org
Wed Nov 18 09:12:02 UTC 2009


Author: mschwendt

Update of /cvs/pkgs/rpms/postgresql-odbcng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14419

Modified Files:
	postgresql-odbcng.spec 
Added Files:
	postgresql-odbcng-0.99.101-debugpkg.patch 
Log Message:
* Wed Nov 18 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.90.101-3
- Fix library symlinks installation (#460900).
- Add Ville's debuginfo patch from 0.99.101-0.2.test1


postgresql-odbcng-0.99.101-debugpkg.patch:
 makefile.in |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE postgresql-odbcng-0.99.101-debugpkg.patch ---
diff -up odbcng-0.99.101/makefile.in~ odbcng-0.99.101/makefile.in
--- odbcng-0.99.101/makefile.in~	2009-03-05 19:36:26.000000000 +0200
+++ odbcng-0.99.101/makefile.in	2009-05-08 21:32:55.000000000 +0300
@@ -24,8 +24,6 @@ CFLAGS += @DEFS@ -D'ODBCNG_FILE_NAME="@O
 
 ifeq ($(DEBUG), true)
 	CFLAGS += -g -DDEBUG
-else
-	CFLAGS += -g0
 endif
 
 ifeq ($(UNICODE), true)
@@ -85,9 +83,6 @@ else
 endif # win32
 
 all: lib$(LIBNAME).a $(SHLIB)
-ifneq ($(DEBUG), true)
-	strip .libs/$(SHLIB)
-endif
 	@echo "@PACKAGE_STRING@ successfully made. Ready to install."
 
 distclean:


Index: postgresql-odbcng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-odbcng/F-10/postgresql-odbcng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- postgresql-odbcng.spec	6 Jun 2008 20:47:45 -0000	1.3
+++ postgresql-odbcng.spec	18 Nov 2009 09:12:02 -0000	1.4
@@ -3,7 +3,7 @@
 Name:		postgresql-%{sname}
 Summary:	PostgreSQL ODBCng driver
 Version:	0.90.101
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	LGPLv2
 Group:		Applications/Databases
 Url:		http://projects.commandprompt.com/public/%{sname}
@@ -12,6 +12,8 @@ Url:		http://projects.commandprompt.com/
 # at the end, but I had to skip that part.
 Source0:	https://projects.commandprompt.com/public/%{sname}/attachment/wiki/Downloads/%{sname}-%{version}.tar.gz
 
+Patch0:		%{name}-0.99.101-debugpkg.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel, unixODBC-devel
@@ -24,27 +26,24 @@ libpq or any PostgreSQL libraries be ins
 
 %prep
 %setup -q -n %{sname}-%{version}
+%patch0 -p1
 
 aclocal
 libtoolize --force
 autoconf
 
-sed -i.strip -e 's|strip|true strip|' makefile.in
 
 %build
-
+# warning: unrecognized option --with-ssl
 %configure --with-ssl
 
 make
 
 %install
 rm -rf %{buildroot}
-install -m 755 -d %{buildroot}/%{_libdir}
-install -m 755 ./.libs/libmodbc.so* %{buildroot}/%{_libdir}
+make destdir=%{buildroot} DESTDIR=%{buildroot} install
+rm -f %{buildroot}%{_libdir}/*{.a,.la}
 
-pushd %{buildroot}/%{_libdir}
-popd
-#strip %{buildroot}/%{_libdir}/*.so
 
 %clean
 rm -rf %{buildroot}
@@ -54,10 +53,14 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%attr(755,root,root) %{_libdir}/libmodbc.so*
+%{_libdir}/libmodbc.so*
 %doc COPYING COPYRIGHT LICENSE.txt
 
 %changelog
+* Wed Nov 18 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.90.101-3
+- Fix library symlinks installation (#460900).
+- Add Ville's debuginfo patch from 0.99.101-0.2.test1
+
 * Fri Jun 6 2008 Devrim GUNDUZ <devrim at commandprompt.com> - 0.90.101-2
 - Fix debuginfo issue, per review.
 




More information about the scm-commits mailing list