rpms/xpa/devel xpa-2.1.6-makefile.patch, NONE, 1.1 xpa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Sergio Pascual (sergiopr)
fedora-extras-commits at redhat.com
Thu Jun 22 07:35:31 UTC 2006
Author: sergiopr
Update of /cvs/extras/rpms/xpa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6905/devel
Modified Files:
.cvsignore sources
Added Files:
xpa-2.1.6-makefile.patch xpa.spec
Log Message:
auto-import xpa-2.1.6-3.fc5 on branch devel from xpa-2.1.6-3.fc5.src.rpm
xpa-2.1.6-makefile.patch:
--- NEW FILE xpa-2.1.6-makefile.patch ---
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
# 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
# Top-level directory for manual entries:
-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/share/man
# Top-level directory for share entries:
MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/xpa
@@ -141,7 +141,7 @@
# used in link line
# LLIB= $(LIB)
-LLIB= @LLIB@
+LLIB= -L. -lxpa
PROGS = xpaset xpaget xpainfo xpaaccess xpans xpamb
@@ -169,7 +169,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 +178,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 +198,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 +244,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 +253,7 @@
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
- mkdir $$i; \
+ mkdir -p $$i; \
chmod 755 $$i; \
else true; \
fi; \
@@ -261,7 +261,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 +275,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 +286,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; \
--- NEW FILE xpa.spec ---
Name: xpa
Version: 2.1.6
Release: 3%{?dist}
Summary: The XPA messaging system
Group: Development/Libraries
License: LGPL
URL: http://hea-www.harvard.edu/RD/xpa/
Source0: http://hea-www.harvard.edu/saord/download/xpa/%{name}-%{version}.tar.gz
Patch0: xpa-2.1.6-makefile.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl-devel
BuildRequires: libXt-devel
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%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.
%package devel
Summary: Headers for developing programs that will use %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
These are the header files and libraries needed to develop a %{name}
application.
%prep
%setup -q
%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 --includedir=%{_includedir}/%{name}
%{__make} %{?_smp_mflags}
%{__make} %{?_smp_mflags} tclxpa
%install
%{__rm} -fr %{buildroot}
%{__make} INSTALL_ROOT=%{buildroot} install
%clean
%{__rm} -fr %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc COPYING
%{_bindir}/*
%{_libdir}/*so.*
%{_mandir}/man1/*
%{_datadir}/%{name}
%files devel
%defattr(-,root,root)
%doc doc/*.html
%doc doc/*.pdf
%{_libdir}/*.so
%exclude %{_libdir}/*.a
%{_includedir}/*
%{_mandir}/man3/*
%{_mandir}/mann/*
%changelog
* 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.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xpa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jun 2006 07:34:53 -0000 1.1
+++ .cvsignore 22 Jun 2006 07:35:31 -0000 1.2
@@ -0,0 +1 @@
+xpa-2.1.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xpa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jun 2006 07:34:53 -0000 1.1
+++ sources 22 Jun 2006 07:35:31 -0000 1.2
@@ -0,0 +1 @@
+523b8c394f018d698467522ab96be756 xpa-2.1.6.tar.gz
More information about the scm-commits
mailing list