rpms/xpa/devel xpa-makefile.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xpa.spec, 1.26, 1.27 xpa-2.1.6-makefile.patch, 1.3, NONE

Thu Sep 10 16:02:21 UTC 2009

Author: sergiopr

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

Modified Files:
	.cvsignore sources xpa.spec 
Added Files:
	xpa-makefile.patch 
Removed Files:
	xpa-2.1.6-makefile.patch 
Log Message:
* Thu Sep 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.1.10-1
- New upstream source


xpa-makefile.patch:
 Makefile.in |   71 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 23 deletions(-)

--- NEW FILE xpa-makefile.patch ---
diff -ur xpa-2.1.10/Makefile.in xpa.am/Makefile.in
--- xpa-2.1.10/Makefile.in	2009-08-22 23:12:11.000000000 +0200
+++ xpa.am/Makefile.in	2009-09-10 17:52:59.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)$(includedir)
 
 # Top-level directory for manual entries:
-MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
+MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(mandir)
 
 # Top-level directory for share entries:
-MAN_SHARE_DIR =		$(INSTALL_ROOT)$(prefix)/share/xpa
+MAN_SHARE_DIR =		$(INSTALL_ROOT)$(datadir)
 
 # Platform-specific X compiler flags (include file specifications)
 X_CFLAGS = 		@X_CFLAGS@
@@ -102,6 +102,31 @@
 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
@@ -147,7 +172,7 @@
 
 # used in link line
 # LLIB=	$(LIB)
-LLIB=	@LLIB@
+LLIB= -L. -lxpa
 
 PROGS =		xpaset xpaget xpainfo xpaaccess xpans xpamb
 
@@ -175,7 +200,7 @@
 		$(RANLIB) $(LIB)
 
 shlib:		$(LIB)
-		@(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \
+		@(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \
 		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
 		rm -f lib$(PACKAGE).tmp/xt*.o; \
 		rm -f lib$(PACKAGE).tmp/tcl*.o; \
@@ -184,7 +209,7 @@
 		rm -rf lib$(PACKAGE).tmp)
 
 tclxpa:		$(LIB)
-		@(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
+		@(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \
 		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
 		rm -f libtclxpa.tmp/xt*.o; \
 		CC='$(CC)' CXX=$(CXX) \
@@ -204,34 +229,34 @@
 		echo "pkg_mkIndex -direct -verbose . libtclxpa.so; exit"| tclsh)
 
 xpaset:		$(LIB) xpaset.o
-		$(CC) $(LDFLAGS) xpaset.o -o xpaset $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpaset.o -o xpaset $(LLIB) $(LIBS)
 
 xpaget:		$(LIB) xpaget.o
-		$(CC) $(LDFLAGS) xpaget.o -o xpaget $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpaget.o -o xpaget $(LLIB) $(LIBS)
 
 xpainfo:	$(LIB) xpainfo.o
-		$(CC) $(LDFLAGS) xpainfo.o -o xpainfo $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpainfo.o -o xpainfo $(LLIB) $(LIBS)
 
 xpaaccess:	$(LIB) xpaaccess.o
-		$(CC) $(LDFLAGS) xpaaccess.o -o xpaaccess $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpaaccess.o -o xpaaccess $(LLIB) $(LIBS)
 
 xpans:		$(LIB) xpans.o
-		$(CC) $(LDFLAGS) xpans.o -o xpans $(LLIB) $(LIBS) $(TLIB)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpans.o -o xpans $(LLIB) $(LIBS) $(TLIB)
 
 xpamb:		$(LIB) xpamb.o
-		$(CC) $(LDFLAGS) xpamb.o -o xpamb $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpamb.o -o xpamb $(LLIB) $(LIBS)
 
 ctest:		$(LIB) ctest.o
-		$(CC) $(LDFLAGS) ctest.o -o ctest $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) ctest.o -o ctest $(LLIB) $(LIBS)
 
 stest:		$(LIB) stest.o
-		$(CC) $(LDFLAGS) stest.o -o stest $(LIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) stest.o -o stest $(LIB) $(LIBS)
 
 rtest:		$(LIB) rtest.o
-		$(CC) $(LDFLAGS) rtest.o -o rtest $(LIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) rtest.o -o rtest $(LIB) $(LIBS)
 
 stestx:		$(LIB) stest.o
-		$(CC) $(LDFLAGS) stest.o -o stest $(LIB) \
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) stest.o -o stest $(LIB) \
 		$(X_LIBS) -lXt $(X_PRE_LIBS) -lXext -lX11 $(LIBS)
 
 # Smoke test: allows end-users to quickly discern basic usability
@@ -257,7 +282,7 @@
 	   else \
 		echo "Installing $$i" ; \
 		$(INSTALL_DATA) $$i $(LIB_INSTALL_DIR)/$$i ; \
-		chmod 555 $(LIB_INSTALL_DIR)/$$i; \
+		chmod 755 $(LIB_INSTALL_DIR)/$$i; \
 	   fi; \
 	   done;)
 
@@ -266,7 +291,7 @@
 	    do \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
-		mkdir $$i; \
+		mkdir -p $$i; \
 		chmod 755 $$i; \
 		else true; \
 		fi; \
@@ -274,7 +299,7 @@
 	@echo "Installing $(LIB)";
 	@$(INSTALL_DATA) $(LIB) $(LIB_INSTALL_DIR)/$(LIB);
 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(LIB));
-	@chmod 555 $(LIB_INSTALL_DIR)/$(LIB);
+	@chmod 755 $(LIB_INSTALL_DIR)/$(LIB);
 	@echo "Installing xpa.h"
 	@$(INSTALL_DATA) xpa.h $(INCLUDE_INSTALL_DIR)/xpa.h
 	@echo "Installing prsetup.h"
@@ -288,7 +313,7 @@
 install-man:
 	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
 	    echo "Making directory $(MAN_INSTALL_DIR)"; \
-	    mkdir $(MAN_INSTALL_DIR); \
+	    mkdir -p $(MAN_INSTALL_DIR); \
 	    chmod 755 $(MAN_INSTALL_DIR); \
 	    else true; \
 	fi;
@@ -299,7 +324,7 @@
 		M="$(MAN_INSTALL_DIR)/man$$E"; \
 		if [ ! -d $$M ] ; then \
 		    echo "Making directory $$M"; \
-		    mkdir $$M; \
+		    mkdir -p $$M; \
 		    chmod 755 $$M; \
 		    else true; \
 		fi; \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	13 Nov 2007 11:01:53 -0000	1.4
+++ .cvsignore	10 Sep 2009 16:02:20 -0000	1.5
@@ -1 +1 @@
-xpa-2.1.8.tar.gz
+xpa-2.1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Nov 2007 11:01:53 -0000	1.4
+++ sources	10 Sep 2009 16:02:20 -0000	1.5
@@ -1 +1 @@
-d5ca64ab2b6a487bfa2f3277d4768656  xpa-2.1.8.tar.gz
+af8c65ed96e672f7d4abd3492bdaa93c  xpa-2.1.10.tar.gz


Index: xpa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpa/devel/xpa.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xpa.spec	27 Jul 2009 08:41:04 -0000	1.26
+++ xpa.spec	10 Sep 2009 16:02:21 -0000	1.27
@@ -2,18 +2,15 @@
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name: xpa
-Version: 2.1.8
-Release: 10%{?dist}
+Version: 2.1.10
+Release: 1%{?dist}
 Summary: The X Public Access messaging system
 
-# Upstream version
-%define upversion 2.1.8
-
 Group: Applications/Engineering
 License: LGPLv2+
 URL: http://hea-www.harvard.edu/RD/xpa/
-Source0: http://hea-www.harvard.edu/saord/download/xpa/%{name}-%{upversion}.tar.gz
-Patch0: xpa-2.1.6-makefile.patch
+Source0: http://hea-www.harvard.edu/saord/download/xpa/%{name}-%{version}.tar.gz
+Patch0: xpa-makefile.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: %{name}-libs = %{version}-%{release}
@@ -61,27 +58,27 @@ of Unix programs, including X programs a
 This package contains the %{name} TCL interface
 
 %prep
-%setup -q -n %{name}-%{upversion}
+%setup -q -n %{name}-%{version}
 %patch0 -p1
 # Remove ps files in html docs
-%{__rm} -rf %{_builddir}/%{name}-%{version}/doc/*.ps
+rm -rf %{_builddir}/%{name}-%{version}/doc/*.ps
 
 %build
 %configure --includedir=%{_includedir}/xpa --datadir=%{_datadir}/xpa \
 	--enable-shared --with-tcl=%{_libdir} \
 	--with-x --enable-threaded-xpans
-%{__make} %{?_smp_mflags}
-%{__make} %{?_smp_mflags} tclxpa
+make %{?_smp_mflags}
+make %{?_smp_mflags} tclxpa
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} INSTALL_ROOT=%{buildroot} install
-%{__mkdir_p} %{buildroot}%{tcl_sitearch}/tclxpa
-%{__cp} -a pkgIndex.tcl %{buildroot}%{tcl_sitearch}/tclxpa
-%{__mv} %{buildroot}%{_libdir}/libtcl* %{buildroot}%{tcl_sitearch}/tclxpa
+rm -rf %{buildroot}
+make INSTALL_ROOT=%{buildroot} install
+mkdir -p %{buildroot}%{tcl_sitearch}/tclxpa
+cp -a pkgIndex.tcl %{buildroot}%{tcl_sitearch}/tclxpa
+mv %{buildroot}%{_libdir}/libtcl* %{buildroot}%{tcl_sitearch}/tclxpa
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post libs -p /sbin/ldconfig
 
@@ -115,6 +112,9 @@ This package contains the %{name} TCL in
 %exclude %{_libdir}/*.a
 
 %changelog
+* Thu Sep 10 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.1.10-1
+- New upstream source
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.8-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- xpa-2.1.6-makefile.patch DELETED ---


