rpms/slang/devel slang-2.2.2-makefile.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 slang.spec, 1.57, 1.58 sources, 1.16, 1.17 slang-2.1.4-makefile.patch, 1.1, NONE

Miroslav Lichvar mlichvar at fedoraproject.org
Mon Dec 7 09:44:43 UTC 2009 

Author: mlichvar

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

Modified Files:
	.cvsignore slang.spec sources 
Added Files:
	slang-2.2.2-makefile.patch 
Removed Files:
	slang-2.1.4-makefile.patch 
Log Message:
- update to 2.2.2


slang-2.2.2-makefile.patch:
 autoconf/Makefile.in |    3 +--
 modules/Makefile.in  |    4 ++--
 slsh/Makefile.in     |    2 +-
 src/Makefile.in      |   22 ++++++++++++++--------
 4 files changed, 18 insertions(+), 13 deletions(-)

--- NEW FILE slang-2.2.2-makefile.patch ---
diff -up slang-2.2.2/autoconf/Makefile.in.makefile slang-2.2.2/autoconf/Makefile.in
--- slang-2.2.2/autoconf/Makefile.in.makefile	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/autoconf/Makefile.in	2009-12-07 10:02:56.000000000 +0100
@@ -47,8 +47,7 @@ help:
 	@echo "make check : Build the library and run the regression tests"
 static: makefiles
 	cd src; $(MAKE) static
-	cd slsh; $(MAKE) all
-elf: makefiles
+elf: makefiles static
 	cd src; $(MAKE) elf
 	cd slsh; $(MAKE) all
 	cd modules; $(MAKE) all
diff -up slang-2.2.2/modules/Makefile.in.makefile slang-2.2.2/modules/Makefile.in
--- slang-2.2.2/modules/Makefile.in.makefile	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/modules/Makefile.in	2009-12-07 10:02:56.000000000 +0100
@@ -59,7 +59,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@
 MODULE_INSTALL_DIR = @libdir@/slang/v at slang_major_version@/modules
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
-INSTALL_MODULE	= @INSTALL_MODULE@
+INSTALL_MODULE	= @INSTALL@
 MKINSDIR	= ../autoconf/mkinsdir.sh
 SLSH_DIR	= $(prefix)/share/slsh
 CMAPS_DIR	= $(SLSH_DIR)/cmaps
@@ -73,7 +73,7 @@ DEST_SLSH_DIR	= $(DESTDIR)$(SLSH_DIR)
 DEST_CMAPSDIR	= $(DESTDIR)$(CMAPS_DIR)
 DEST_HELPDIR	= $(DESTDIR)$(HELP_DIR)
 #---------------------------------------------------------------------------
-RPATH = @RPATH@
+RPATH =
 
 LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) @M_LIB@
 #LIBS = $(RPATH) $(DL_LIB) @M_LIB@
diff -up slang-2.2.2/slsh/Makefile.in.makefile slang-2.2.2/slsh/Makefile.in
--- slang-2.2.2/slsh/Makefile.in.makefile	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/slsh/Makefile.in	2009-12-07 10:02:56.000000000 +0100
@@ -15,7 +15,7 @@ SLANG_SRCINC	= -I at SRCDIR@
 SLANG_SRCLIB	= -L at ELFDIR@
 #---------------------------------------------------------------------------
 OTHER_LIBS	= @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
-RPATH		= @RPATH@
+RPATH		=
 #----------------------------------------------------------------------------
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
diff -up slang-2.2.2/src/Makefile.in.makefile slang-2.2.2/src/Makefile.in
--- slang-2.2.2/src/Makefile.in.makefile	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/src/Makefile.in	2009-12-07 10:02:56.000000000 +0100
@@ -139,17 +139,21 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda
 # Rules
 #---------------------------------------------------------------------------
 all: static elf
-static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
-elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
+static: $(OBJDIR)/stamp $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
+elf: $(ELFDIR)/stamp $(CONFIG_H) $(ELFDIR_ELF_LIB)
 
-$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
+$(OBJS): $(OBJDIR)/stamp
+
+$(ELFOBJS): $(ELFDIR)/stamp
+
+$(OBJDIR_NORMAL_LIB): $(CONFIG_H) $(OBJS)
 	-$(RM) $(OBJDIR_NORMAL_LIB)
 	cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
 	$(RANLIB) $(OBJDIR_NORMAL_LIB)
 	@echo ""
 	@echo $(NORMAL_LIB) created in $(OBJDIR)
 
-$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
+$(ELFDIR_ELF_LIB): $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
 	-$(RM) $(ELFDIR_ELF_LIB)
 	cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS)
 	if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \
@@ -160,10 +164,12 @@ $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H)
 	@echo $(ELFLIB_BUILD_NAME) created in $(ELFDIR).
 	@echo The link $(ELFLIB) to $(ELFLIB_BUILD_NAME) was also created.
 	@echo ""
-$(OBJDIR) :
+$(OBJDIR)/stamp :
 	-$(MKDIR) $(OBJDIR)
-$(ELFDIR) :
+	touch $(OBJDIR)/stamp
+$(ELFDIR)/stamp :
 	-$(MKDIR) $(ELFDIR)
+	touch $(ELFDIR)/stamp
 $(CONFIG_H) : sysconf.h
 	-$(CP) sysconf.h $(CONFIG_H)
 
@@ -194,9 +200,9 @@ install-elf-and-links:
 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
 	@echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR)
-	$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
+	$(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
 	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR)
-	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB)
+	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
 	@echo ""
 	@echo $(ELFLIB_BUILD_NAME) created in $(DEST_LIBDIR).
 	@echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_BUILD_NAME) were also created.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	7 Sep 2009 12:07:57 -0000	1.16
+++ .cvsignore	7 Dec 2009 09:44:42 -0000	1.17
@@ -1 +1 @@
-slang-2.2.1.tar.bz2
+slang-2.2.2.tar.bz2


Index: slang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/slang.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- slang.spec	7 Sep 2009 12:07:57 -0000	1.57
+++ slang.spec	7 Dec 2009 09:44:42 -0000	1.58
@@ -1,12 +1,12 @@
 Summary: The shared library for the S-Lang extension language
 Name: slang
-Version: 2.2.1
+Version: 2.2.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Source: ftp://space.mit.edu/pub/davis/slang/v2.2/%{name}-%{version}.tar.bz2
 # fix file permissions, library symlink, parallel build, remove RPATH
-Patch1: slang-2.1.4-makefile.patch
+Patch1: slang-2.2.2-makefile.patch
 # don't use internal glibc symbol
 Patch2: slang-nointerlibc2.patch
 URL: http://www.jedsoft.org/slang/
@@ -114,6 +114,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libslang*.a
 
 %changelog
+* Mon Dec 07 2009 Miroslav Lichvar <mlichvar at redhat.com> - 2.2.2-1
+- update to 2.2.2
+
 * Mon Sep 07 2009 Miroslav Lichvar <mlichvar at redhat.com> - 2.2.1-1
 - update to 2.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slang/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	7 Sep 2009 12:07:57 -0000	1.16
+++ sources	7 Dec 2009 09:44:42 -0000	1.17
@@ -1 +1 @@
-51b7e9c29c6812f304531713e2ebf969  slang-2.2.1.tar.bz2
+974437602a781cfe92ab61433dd16d03  slang-2.2.2.tar.bz2


--- slang-2.1.4-makefile.patch DELETED ---

More information about the fedora-extras-commits mailing list