packages: openldap-module-sha2/openldap-module-sha2.spec, openldap-module-s...

[sparky]

Author: sparky                       Date: Fri Nov 20 20:17:02 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- moar PLD-way: use rpmldflags when linking

---- Files affected:
packages/openldap-module-sha2:
   openldap-module-sha2.spec (1.5 -> 1.6) , openldap-module-sha2-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/openldap-module-sha2/openldap-module-sha2.spec
diff -u packages/openldap-module-sha2/openldap-module-sha2.spec:1.5 packages/openldap-module-sha2/openldap-module-sha2.spec:1.6
--- packages/openldap-module-sha2/openldap-module-sha2.spec:1.5	Fri Nov 20 21:08:39 2009
+++ packages/openldap-module-sha2/openldap-module-sha2.spec	Fri Nov 20 21:16:56 2009
@@ -12,6 +12,7 @@
 # Source0-md5:	56e27d51467898783da461c4f0c78091
 URL:		http://confluence.atlassian.com/display/JIRAEXT/OpenLDAP+support+for+SHA-2+%28SHA-256,+SHA-384,+SHA-512%29+and+atlassian-sha1+passwords
 BuildRequires:	openldap-headers
+Patch0:		%{name}-link.patch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -22,14 +23,17 @@
 
 %prep
 %setup -qn %{name}-%{svnrel}
+%patch0 -p1
 
 %build
 %{__make} \
 	CC="%{__cc}" \
-	CCFLAGS="%{rpmcflags} -fPIC -I%{_includedir}/openldap"
+	CCFLAGS="%{rpmcflags} -fPIC -I%{_includedir}/openldap" \
+	LDFLAGS="%{rpmldflags}"
 %{__make} -C standalone \
 	CC="%{__cc}" \
-	CCFLAGS="%{rpmcflags} -fPIC"
+	CCFLAGS="%{rpmcflags} -fPIC" \
+	LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -52,6 +56,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2009/11/20 20:16:56  sparky
+- moar PLD-way: use rpmldflags when linking
+
 Revision 1.5  2009/11/20 20:08:39  shadzik
 - the PLD-way
 

================================================================
Index: packages/openldap-module-sha2/openldap-module-sha2-link.patch
diff -u /dev/null packages/openldap-module-sha2/openldap-module-sha2-link.patch:1.1
--- /dev/null	Fri Nov 20 21:17:02 2009
+++ packages/openldap-module-sha2/openldap-module-sha2-link.patch	Fri Nov 20 21:16:56 2009
@@ -0,0 +1,24 @@
+diff -Nur openldap-module-sha2-37261.orig/Makefile openldap-module-sha2-37261/Makefile
+--- openldap-module-sha2-37261.orig/Makefile	2009-11-20 16:19:07.000000000 +0100
++++ openldap-module-sha2-37261/Makefile	2009-11-20 21:12:36.488766532 +0100
+@@ -4,7 +4,7 @@
+ CCFLAGS = -Wall -g
+ 
+ slapd-sha2.so: slapd-sha2.o sha2.o
+-	$(CC) -I$(OPENLDAP)/include -shared -Wall -g $^ -o $@
++	$(CC) -I$(OPENLDAP)/include -shared -Wall $(CCFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ %.o: %.c
+ 	$(CC) -I$(OPENLDAP)/include $(CCFLAGS) -c $<
+diff -Nur openldap-module-sha2-37261.orig/standalone/Makefile openldap-module-sha2-37261/standalone/Makefile
+--- openldap-module-sha2-37261.orig/standalone/Makefile	2009-11-20 16:19:07.000000000 +0100
++++ openldap-module-sha2-37261/standalone/Makefile	2009-11-20 21:12:55.742230903 +0100
+@@ -1,7 +1,7 @@
+ CCFLAGS = -Wall -O2
+ 
+ sha2print: sha2.o sha2print.o base64.o
+-	$(CC) $(CCFLAGS) $^ -o $@
++	$(CC) $(CCFLAGS) $(LDFLAGS)  $^ -o $@
+ 
+ %.o: %.c
+ 	$(CC) $(CCFLAGS) -c $<
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap-module-sha2/openldap-module-sha2.spec?r1=1.5&r2=1.6&f=u