rpms/openldap/devel openldap-2.4.6-pie.patch, 1.1, 1.2 openldap.spec, 1.129, 1.130

[Jan Šafránek (jsafrane)]

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23852

Modified Files:
	openldap-2.4.6-pie.patch openldap.spec 
Log Message:
rediff all patches to get rid of fuzz=2

openldap-2.4.6-pie.patch:

Index: openldap-2.4.6-pie.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.4.6-pie.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openldap-2.4.6-pie.patch	21 Nov 2007 12:12:15 -0000	1.1
+++ openldap-2.4.6-pie.patch	25 Jul 2008 11:15:20 -0000	1.2
@@ -2,14 +2,15 @@
 should be threaded into the various autotools, but I guess this is what we have
 until that happens, if it happens.
 
---- openldap-2.2.13/servers/slapd/Makefile.in	2004-04-12 14:07:40.000000000 -0400
-+++ openldap-2.2.13/servers/slapd/Makefile.in	2004-06-15 13:45:45.000000000 -0400
-@@ -255,7 +255,7 @@
+diff -up openldap-2.4.11/servers/slapd/Makefile.in.backup_patch_3 openldap-2.4.11/servers/slapd/Makefile.in
+--- openldap-2.4.11/servers/slapd/Makefile.in.backup_patch_3	2008-02-12 00:26:43.000000000 +0100
++++ openldap-2.4.11/servers/slapd/Makefile.in	2008-07-25 13:13:37.000000000 +0200
+@@ -266,7 +266,7 @@ libslapi.a: slapi/.libs/libslapi.a
  	cp slapi/.libs/libslapi.a .
  
  slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
 -	$(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
 +	$(LTLINK) -pie -Wl,-z,defs -o $@ $(SLAPD_OBJECTS) $(LIBS) \
  		$(WRAP_LIBS)
- 	rm -f $(SLAPTOOLS)
+ 	$(RM) $(SLAPTOOLS)
  	for i in $(SLAPTOOLS); do \


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- openldap.spec	21 Jul 2008 08:17:30 -0000	1.129
+++ openldap.spec	25 Jul 2008 11:15:20 -0000	1.130
@@ -8,9 +8,6 @@
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
 
-#TODO: rediff the patches which need fuzz
-%define _default_patch_fuzz 2
-
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version}