rpms/libmcrypt/F-7 libmcrypt-2.5.8-nolibltdl.patch, NONE, 1.1 libmcrypt.spec, 1.6, 1.7 sources, 1.2, 1.3

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/libmcrypt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11539/F-7

Modified Files:
	libmcrypt.spec sources 
Added Files:
	libmcrypt-2.5.8-nolibltdl.patch 
Log Message:

Fix multilib, bring F-7 current


libmcrypt-2.5.8-nolibltdl.patch:

--- NEW FILE libmcrypt-2.5.8-nolibltdl.patch ---
diff -up libmcrypt-2.5.8/Makefile.in.orig libmcrypt-2.5.8/Makefile.in
--- libmcrypt-2.5.8/Makefile.in.orig	2007-02-19 00:32:38.000000000 -0600
+++ libmcrypt-2.5.8/Makefile.in	2007-07-19 21:23:39.000000000 -0500
@@ -209,8 +209,8 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 INCLUDES = $(INCLTDL)
 EXTRA_DIST = KNOWN-BUGS THANKS NEWS libmcrypt.spec.in libmcrypt.spec COPYING.LIB
-DIST_SUBDIRS = libltdl modules include lib src doc
-SUBDIRS = $(LIBLTDL_DIR) modules include lib src doc
+DIST_SUBDIRS = modules include lib src doc
+SUBDIRS = modules include lib src doc
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff -up libmcrypt-2.5.8/configure.orig libmcrypt-2.5.8/configure
--- libmcrypt-2.5.8/configure.orig	2007-02-19 00:32:39.000000000 -0600
+++ libmcrypt-2.5.8/configure	2007-07-19 21:21:38.000000000 -0500
@@ -426,7 +426,7 @@ PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
 ac_unique_file="lib/mcrypt.c"
-ac_subdirs_all="$ac_subdirs_all libltdl"
+ac_subdirs_all="$ac_subdirs_all"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -4425,7 +4425,7 @@ fi
 
 
 
-subdirs="$subdirs libltdl"
+subdirs="$subdirs"
 
  # Check whether --enable-static or --disable-static was given.
 if test "${enable_static+set}" = set; then


Index: libmcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/libmcrypt/F-7/libmcrypt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libmcrypt.spec	23 Aug 2007 22:25:54 -0000	1.6
+++ libmcrypt.spec	29 Oct 2007 17:58:39 -0000	1.7
@@ -1,13 +1,12 @@
 Name:		libmcrypt
-Version:	2.5.7
-Release:	5%{?dist}
+Version:	2.5.8
+Release:	4%{?dist}
 License:	LGPLv2+
 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
+Patch0:		libmcrypt-2.5.8-nolibltdl.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool-ltdl-devel
 
@@ -27,10 +26,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-%configure --enable-static=yes
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -38,6 +36,9 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \;
 
+# Multilib fix
+touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/libmcrypt-config
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -54,12 +55,25 @@
 %defattr(-,root,root,-)
 %doc doc/README.key doc/README.xtea doc/example.c
 %{_bindir}/libmcrypt-config
+%{_includedir}/mutils/
 %{_includedir}/mcrypt.h
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_datadir}/aclocal/libmcrypt.m4
 
 %changelog
+* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.8-4
+- multilib fix (bz 342221)
+
+* Tue Oct  9 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.8-3
+- get rid of the static lib, causes failures (bz 278671)
+
+* Thu Aug 23 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.8-2
+- fix license tag (v2+), rebuild for ppc32
+
+* Thu Jul 19 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.8-1
+- bump to 2.5.8
+- proper quoting fixed upstream, patch1 obsolete
+
 * Sun Oct  8 2006 Ed Hill <ed at eh3.com> 2.5.7-5
 - bz 209913 : libmcrypt.m4 in -devel and properly quote it
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmcrypt/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Sep 2005 16:28:31 -0000	1.2
+++ sources	29 Oct 2007 17:58:39 -0000	1.3
@@ -1 +1 @@
-b1be163143f8e8ed0474beeb642b3bad  libmcrypt-2.5.7.tar.gz
+0821830d930a86a5c69110837c55b7da  libmcrypt-2.5.8.tar.gz