rpms/libmcrypt/FC-4 libmcrypt-2.5.7-aclocal_underquoted.patch, NONE, 1.1 libmcrypt.spec, 1.3, 1.4

Ed Hill (edhill) fedora-extras-commits at redhat.com
Sun Oct 8 14:24:12 UTC 2006


Author: edhill

Update of /cvs/extras/rpms/libmcrypt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6598/FC-4

Modified Files:
	libmcrypt.spec 
Added Files:
	libmcrypt-2.5.7-aclocal_underquoted.patch 
Log Message:
bz 209913 : libmcrypt.m4 in -devel and properly quote it


libmcrypt-2.5.7-aclocal_underquoted.patch:

--- NEW FILE libmcrypt-2.5.7-aclocal_underquoted.patch ---
--- libmcrypt-2.5.7/lib/libmcrypt.m4	2006-10-08 09:04:36.000000000 -0400
+++ libmcrypt-2.5.7/lib/libmcrypt.m4_ORIG	2006-10-08 08:57:00.000000000 -0400
@@ -14,7 +14,7 @@
 dnl AM_PATH_LIBMCRYPT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libmcrypt, and define LIBMCRYPT_CFLAGS and LIBMCRYPT_LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBMCRYPT,
+AC_DEFUN([AM_PATH_LIBMCRYPT],
 [dnl
 dnl Get the cflags and libraries from the libmcrypt-config script
 dnl
@@ -164,7 +164,7 @@
         printf("*** of LIBMCRYPT, but you can also set the LIBMCRYPT_CONFIG environment to point to the\n");
         printf("*** correct copy of libmcrypt-config. (In this case, you will have to\n");
         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
+        printf("*** so that the correct libraries are found at run-time)\n");
       }
     }
   return 1;


Index: libmcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/libmcrypt/FC-4/libmcrypt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmcrypt.spec	28 Feb 2006 22:43:47 -0000	1.3
+++ libmcrypt.spec	8 Oct 2006 14:24:12 -0000	1.4
@@ -1,12 +1,13 @@
 Name:		libmcrypt
 Version:	2.5.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 Summary:	Encryption algorithms library
 URL:		http://mcrypt.sourceforge.net/
 Source0:	http://download.sourceforge.net/mcrypt/libmcrypt-%{version}.tar.gz
 Patch0:		libmcrypt-2.5.7-nolibltdl.patch
+Patch1:		libmcrypt-2.5.7-aclocal_underquoted.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool-ltdl-devel
 
@@ -26,6 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-static=yes
@@ -46,7 +48,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog KNOWN-BUGS README NEWS THANKS TODO
 %{_libdir}/*.so.*
-%{_datadir}/aclocal/libmcrypt.m4
 %{_mandir}/man3/*
 
 %files devel
@@ -56,8 +57,12 @@
 %{_includedir}/mcrypt.h
 %{_libdir}/*.a
 %{_libdir}/*.so
+%{_datadir}/aclocal/libmcrypt.m4
 
 %changelog
+* Sun Oct  8 2006 Ed Hill <ed at eh3.com> 2.5.7-4
+- bz 209913 : libmcrypt.m4 in -devel and properly quote it
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.7-3
 - bump for FC-5
 




More information about the fedora-extras-commits mailing list