rpms/xpa/devel xpa-2.1.6-makefile.patch,1.1,1.2 xpa.spec,1.1,1.2

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/extras/rpms/xpa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18697

Modified Files:
	xpa-2.1.6-makefile.patch xpa.spec 
Log Message:
* Thu Jun 22 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.6-4
- Patch0 is modified so Makefile installs in $(libdir) instead of $(prefix)/lib
* Mon Jun 19 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.6-3
- Added some space between package devel and description devel and
  between install and clean to improve the flow and readability of the file.
* Tue Jun 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.6-2
- Specfile polished, minor fixes.
* Wed Feb 22 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.6-1
- Initial spec file.


xpa-2.1.6-makefile.patch:

Index: xpa-2.1.6-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/xpa/devel/xpa-2.1.6-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xpa-2.1.6-makefile.patch	22 Jun 2006 07:35:31 -0000	1.1
+++ xpa-2.1.6-makefile.patch	22 Jun 2006 11:11:34 -0000	1.2
@@ -1,20 +1,62 @@
 diff -ur xpa-2.1.6.orig/Makefile.in xpa-2.1.6/Makefile.in
 --- xpa-2.1.6.orig/Makefile.in	2005-03-31 21:36:03.000000000 +0200
-+++ xpa-2.1.6/Makefile.in	2006-06-13 11:57:04.000000000 +0200
-@@ -43,10 +43,10 @@
- BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
++++ xpa-2.1.6/Makefile.in	2006-06-22 12:57:40.000000000 +0200
+@@ -37,19 +37,19 @@
+ INSTALL_ROOT =
+ 
+ # Directory in which to install the .a or .so binary for the XPA library:
+-LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(libdir)
+ 
+ # Directory in which to install the program wish:
+-BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(bindir)
  
  # Directory in which to install the include file xpa.h:
 -INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include/xpa
++INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(includedir)/xpa
  
  # Top-level directory for manual entries:
 -MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
-+MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/share/man
++MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(mandir)
  
  # Top-level directory for share entries:
- MAN_SHARE_DIR =		$(INSTALL_ROOT)$(prefix)/share/xpa
-@@ -141,7 +141,7 @@
+-MAN_SHARE_DIR =		$(INSTALL_ROOT)$(prefix)/share/xpa
++MAN_SHARE_DIR =		$(INSTALL_ROOT)$(datadir)/xpa
+ 
+ # Platform-specific X compiler flags (include file specifications)
+ X_CFLAGS = 		@X_CFLAGS@
+@@ -98,6 +98,29 @@
+ INSTALL_PROGRAM =	${INSTALL}
+ INSTALL_DATA =		${INSTALL} -m 644
+ 
++# Added by fedora rpm patch
++bindir = @bindir@
++build_alias = @build_alias@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host_alias = @host_alias@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++# end
++
+ #----------------------------------------------------------------
+ # The information below is modified by the configure script when
+ # Makefile is generated from Makefile.in.  You shouldn't normally
+@@ -141,7 +164,7 @@
  
  # used in link line
  # LLIB=	$(LIB)
@@ -23,7 +65,7 @@
  
  PROGS =		xpaset xpaget xpainfo xpaaccess xpans xpamb
  
-@@ -169,7 +169,7 @@
+@@ -169,7 +192,7 @@
  		$(RANLIB) $(LIB)
  
  shlib:		$(LIB)
@@ -32,7 +74,7 @@
  		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
  		rm -f lib$(PACKAGE).tmp/xt*.o; \
  		rm -f lib$(PACKAGE).tmp/tcl*.o; \
-@@ -178,7 +178,7 @@
+@@ -178,7 +201,7 @@
  		rm -rf lib$(PACKAGE).tmp)
  
  tclxpa:		$(LIB)
@@ -41,7 +83,7 @@
  		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
  		rm -f libtclxpa.tmp/xt*.o; \
  		CC='$(CC)' CXX=$(CXX) \
-@@ -198,34 +198,34 @@
+@@ -198,34 +221,34 @@
  		echo "pkg_mkIndex -direct -verbose . libtclxpa.so; exit"| tclsh)
  
  xpaset:		$(LIB) xpaset.o
@@ -86,7 +128,7 @@
  		$(X_LIBS) -lXt $(X_PRE_LIBS) -lXext -lX11 $(LIBS)
  
  # Note: before running ranlib below, must cd to target directory because
-@@ -244,7 +244,7 @@
+@@ -244,7 +267,7 @@
  	   else \
  		echo "Installing $$i" ; \
  		$(INSTALL_DATA) $$i $(LIB_INSTALL_DIR)/$$i ; \
@@ -95,7 +137,7 @@
  	   fi; \
  	   done;)
  
-@@ -253,7 +253,7 @@
+@@ -253,7 +276,7 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
@@ -104,7 +146,7 @@
  		chmod 755 $$i; \
  		else true; \
  		fi; \
-@@ -261,7 +261,7 @@
+@@ -261,7 +284,7 @@
  	@echo "Installing $(LIB)";
  	@$(INSTALL_DATA) $(LIB) $(LIB_INSTALL_DIR)/$(LIB);
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(LIB));
@@ -113,7 +155,7 @@
  	@echo "Installing xpa.h"
  	@$(INSTALL_DATA) xpa.h $(INCLUDE_INSTALL_DIR)/xpa.h
  	@echo "Installing prsetup.h"
-@@ -275,7 +275,7 @@
+@@ -275,7 +298,7 @@
  install-man:
  	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
  	    echo "Making directory $(MAN_INSTALL_DIR)"; \
@@ -122,7 +164,7 @@
  	    chmod 755 $(MAN_INSTALL_DIR); \
  	    else true; \
  	fi;
-@@ -286,7 +286,7 @@
+@@ -286,7 +309,7 @@
  		M="$(MAN_INSTALL_DIR)/man$$E"; \
  		if [ ! -d $$M ] ; then \
  		    echo "Making directory $$M"; \


Index: xpa.spec
===================================================================
RCS file: /cvs/extras/rpms/xpa/devel/xpa.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xpa.spec	22 Jun 2006 07:35:31 -0000	1.1
+++ xpa.spec	22 Jun 2006 11:11:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name: xpa
 Version: 2.1.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: The XPA messaging system
 
 Group: Development/Libraries
@@ -76,6 +76,8 @@
 %{_mandir}/mann/*
 
 %changelog
+* Thu Jun 22 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.6-4
+- Patch0 is modified so Makefile installs in $(libdir) instead of $(prefix)/lib
 * Mon Jun 19 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.6-3
 - Added some space between package devel and description devel and
   between install and clean to improve the flow and readability of the file.