rpms/xpa/EL-5 .cvsignore, 1.4, 1.5 Makefile, 1.2, 1.3 sources, 1.4, 1.5 xpa-2.1.6-makefile.patch, 1.3, 1.4 xpa.spec, 1.10, 1.11
Sergio Pascual (sergiopr)
fedora-extras-commits at redhat.com
Thu Jul 17 08:28:29 UTC 2008
Author: sergiopr
Update of /cvs/pkgs/rpms/xpa/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4631
Added Files:
.cvsignore Makefile sources xpa-2.1.6-makefile.patch xpa.spec
Log Message:
* Sat Dec 08 2007 Sergio Pascual <sergiopr at fedoraproject dot org> 2.1.8-3
- Tcl interface in a different subpackage
- pkgIndex.tcl added
Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ .cvsignore 17 Jul 2008 08:27:35 -0000 1.5
@@ -0,0 +1 @@
+xpa-2.1.7b2.tar.gz
Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Makefile 17 Jul 2008 08:27:35 -0000 1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: xpa
+# $Id$
+NAME := xpa
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 17 Jul 2008 08:27:35 -0000 1.5
@@ -0,0 +1 @@
+d5ca64ab2b6a487bfa2f3277d4768656 xpa-2.1.8.tar.gz
xpa-2.1.6-makefile.patch:
Index: xpa-2.1.6-makefile.patch
===================================================================
RCS file: xpa-2.1.6-makefile.patch
diff -N xpa-2.1.6-makefile.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xpa-2.1.6-makefile.patch 17 Jul 2008 08:27:35 -0000 1.4
@@ -0,0 +1,175 @@
+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-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)$(includedir)/xpa
+
+ # 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)/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)
+-LLIB= @LLIB@
++LLIB= -L. -lxpa
+
+ PROGS = xpaset xpaget xpainfo xpaaccess xpans xpamb
+
+@@ -169,7 +192,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; \
+@@ -178,7 +201,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) \
+@@ -198,34 +221,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)
+
+ # Note: before running ranlib below, must cd to target directory because
+@@ -244,7 +267,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;)
+
+@@ -253,7 +276,7 @@
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir $$i; \
++ mkdir -p $$i; \
+ chmod 755 $$i; \
+ else true; \
+ fi; \
+@@ -261,7 +284,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"
+@@ -275,7 +298,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;
+@@ -286,7 +309,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: xpa.spec
===================================================================
RCS file: xpa.spec
diff -N xpa.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xpa.spec 17 Jul 2008 08:27:35 -0000 1.11
@@ -0,0 +1,162 @@
+Name: xpa
+Version: 2.1.8
+Release: 3%{?dist}
+Summary: The XPA 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
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires: %{name}-libs = %{version}-%{release}
+
+BuildRequires: tcl-devel libXt-devel
+BuildRequires: /bin/awk
+
+%description
+The XPA messaging system provides seamless communication between many kinds
+of Unix programs, including X programs and Tcl/Tk programs.
+It also provides an easy way for users to communicate with these
+XPA-enabled programs by executing XPA client commands in the shell or by
+utilizing such commands in scripts. Because XPA works both at the programming
+level and the shell level, it is a powerful tool for unifying any
+analysis environment: users and programmers have great flexibility
+in choosing the best level or levels at which to access XPA services,
+and client access can be extended or modified easily at any time.
+This package contains command-line utilities for managing XPA.
+
+%package devel
+Summary: Headers for developing programs that will use %{name}
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-tcl = %{version}-%{release}
+
+%description devel
+These are the header files and libraries needed to develop a %{name}
+application.
+
+%package libs
+Summary: The XPA messaging system runtime libraries
+Group: System Environment/Libraries
+%description libs
+The XPA messaging system provides seamless communication between many kinds
+of Unix programs, including X programs and Tcl/Tk programs.
+This package contains the %{name} run-time library
+
+%package tcl
+Summary: The XPA messaging system TCL interface
+Group: System Environment/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+%description tcl
+The XPA messaging system provides seamless communication between many kinds
+of Unix programs, including X programs and Tcl/Tk programs.
+This package contains the %{name} TCL interface
+
+%prep
+%setup -q -n %{name}-%{upversion}
+%patch0 -p1
+# Remove ps files in html docs
+%{__rm} -rf %{_builddir}/%{name}-%{version}/doc/*.ps
+
+%build
+%configure --enable-shared --with-tcl=%{_libdir} \
+ --with-x --enable-threaded-xpans
+%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} tclxpa
+
+%install
+%{__rm} -fr %{buildroot}
+%{__mkdir_p} %{buildroot}%{_libdir}/tclxpa
+%{__make} INSTALL_ROOT=%{buildroot} install
+%{__cp} -a pkgIndex.tcl %{buildroot}%{_libdir}/tclxpa
+%{__mv} %{buildroot}%{_libdir}/libtcl* %{buildroot}%{_libdir}/tclxpa
+
+%clean
+%{__rm} -fr %{buildroot}
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_datadir}/%{name}
+
+%files libs
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/libxpa.so.*
+
+%files tcl
+%defattr(-,root,root,-)
+%{_libdir}/tclxpa
+
+%files devel
+%defattr(-,root,root,-)
+%doc doc/*.html
+%doc doc/*.pdf
+%{_libdir}/*.so
+%{_libdir}/tclxpa/*.so
+%{_includedir}/*
+%{_mandir}/man3/*
+%{_mandir}/mann/*
+%exclude %{_libdir}/*.a
+
+%changelog
+* Sat Dec 08 2007 Sergio Pascual <sergiopr at fedoraproject dot org> 2.1.8-3
+- Tcl interface in a different subpackage
+- pkgIndex.tcl added
+
+* Wed Nov 14 2007 Sergio Pascual <sergiopr at fedoraproject dot org> 2.1.8-2
+- Nested dir for headers fixed
+
+* Tue Nov 13 2007 Sergio Pascual <sergiopr at fedoraproject dot org> 2.1.8-1
+- New upstream source
+
+* Sat Oct 13 2007 Sergio Pascual <sergiopr at fedoraproject dot org> 2.1.7-0.3.b2
+- Splitted libraries in a new package
+
+* Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.7-0.2.b2.1
+- Added /bin/awk to BuildReq
+
+* Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.7-0.2.b2
+- Rebuild for Fedora 8 to get the build-id
+
+* Wed Mar 21 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.7-0.1.b2
+- New upstream version 2.1.7b2
+
+* Mon Feb 26 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.6-9
+- Back to tcl 8.4 due to stability problems
+
+* Thu Feb 01 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.6-8
+- Rebuilt for devel (out of sync with tcl).
+
+* Tue Sep 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.6-7
+- Rebuilt for FC6 (tag problem).
+
+* Tue Sep 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.6-6
+- Rebuilt for FC6 (mass rebuild).
+
+* Thu Jul 18 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 2.1.6-5
+- Changed BuildRequires to make common spec for FC-4 and up
+
+* 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.
More information about the scm-commits
mailing list