rpms/readline/devel readline-6.1-shlib.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 readline.spec, 1.45, 1.46 sources, 1.9, 1.10 readline-6.0-shlib.patch, 1.1, NONE readline60-001, 1.1, NONE readline60-002, 1.1, NONE readline60-003, 1.1, NONE readline60-004, 1.1, NONE

Tue Jan 12 14:55:52 UTC 2010

Author: mlichvar

Update of /cvs/pkgs/rpms/readline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29164

Modified Files:
	.cvsignore readline.spec sources 
Added Files:
	readline-6.1-shlib.patch 
Removed Files:
	readline-6.0-shlib.patch readline60-001 readline60-002 
	readline60-003 readline60-004 
Log Message:
- update to 6.1


readline-6.1-shlib.patch:
 shlib/Makefile.in     |    2 +-
 support/shlib-install |    2 +-
 support/shobj-conf    |    5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE readline-6.1-shlib.patch ---
diff -up readline-6.1/shlib/Makefile.in.shlib readline-6.1/shlib/Makefile.in
--- readline-6.1/shlib/Makefile.in.shlib	2009-03-05 16:51:23.000000000 +0100
+++ readline-6.1/shlib/Makefile.in	2010-01-12 15:05:32.000000000 +0100
@@ -170,7 +170,7 @@ $(SHARED_READLINE):	$(SHARED_OBJ)
 
 $(SHARED_HISTORY):	$(SHARED_HISTOBJ) xmalloc.so
 	$(RM) $@
-	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS)
+	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so
 
 # Since tilde.c is shared between readline and bash, make sure we compile 
 # it with the right flags when it's built as part of readline
diff -up readline-6.1/support/shlib-install.shlib readline-6.1/support/shlib-install
--- readline-6.1/support/shlib-install.shlib	2009-10-28 14:30:18.000000000 +0100
+++ readline-6.1/support/shlib-install	2010-01-12 15:05:32.000000000 +0100
@@ -72,7 +72,7 @@ fi
 case "$host_os" in
 hpux*|darwin*|macosx*|linux*)
 	if [ -z "$uninstall" ]; then
-		chmod 555 ${INSTALLDIR}/${LIBNAME}
+		chmod 755 ${INSTALLDIR}/${LIBNAME}
 	fi ;;
 cygwin*|mingw*)
 	IMPLIBNAME=`echo ${LIBNAME} \
diff -up readline-6.1/support/shobj-conf.shlib readline-6.1/support/shobj-conf
--- readline-6.1/support/shobj-conf.shlib	2009-10-28 14:20:21.000000000 +0100
+++ readline-6.1/support/shobj-conf	2010-01-12 15:07:27.000000000 +0100
@@ -112,10 +112,11 @@ sunos5*|solaris2*)
 linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
 	SHOBJ_CFLAGS=-fPIC
 	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+ 	SHOBJ_LDFLAGS='$(CFLAGS) -shared -Wl,-soname,$@'
 
-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+	SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+ 	SHLIB_LIBS='-ltinfo'
 	;;
 
 freebsd2*)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/readline/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	14 Jul 2009 16:46:12 -0000	1.9
+++ .cvsignore	12 Jan 2010 14:55:51 -0000	1.10
@@ -1 +1 @@
-readline-6.0.tar.gz
+readline-6.1.tar.gz


Index: readline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readline/devel/readline.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- readline.spec	25 Aug 2009 15:02:53 -0000	1.45
+++ readline.spec	12 Jan 2010 14:55:51 -0000	1.46
@@ -1,17 +1,13 @@
 Summary: A library for editing typed command lines
 Name: readline
-Version: 6.0
-Release: 3%{?dist}
+Version: 6.1
+Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Libraries
 URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 Source: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz
-Patch1: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-001
-Patch2: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-002
-Patch3: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-003
-Patch4: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-004
 # fix file permissions, remove RPATH, use CFLAGS
-Patch20: readline-6.0-shlib.patch
+Patch20: readline-6.1-shlib.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRequires: ncurses-devel
@@ -50,10 +46,6 @@ library.
 
 %prep
 %setup -q
-%patch1 -p0 -b .001
-%patch2 -p0 -b .002
-%patch3 -p0 -b .003
-%patch4 -p0 -b .004
 %patch20 -p1 -b .shlib
 
 pushd examples
@@ -132,6 +124,9 @@ fi
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Jan 12 2010 Miroslav Lichvar <mlichvar at redhat.com> 6.1-1
+- update to 6.1
+
 * Tue Aug 25 2009 Miroslav Lichvar <mlichvar at redhat.com> 6.0-3
 - include patch 004
 - suppress install-info errors (#515910)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/readline/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Jul 2009 16:46:14 -0000	1.9
+++ sources	12 Jan 2010 14:55:52 -0000	1.10
@@ -1 +1 @@
-b7f65a48add447693be6e86f04a63019  readline-6.0.tar.gz
+fc2f7e714fe792db1ce6ddc4c9fb4ef3  readline-6.1.tar.gz


--- readline-6.0-shlib.patch DELETED ---


--- readline60-001 DELETED ---


--- readline60-002 DELETED ---


--- readline60-003 DELETED ---


--- readline60-004 DELETED ---

