[glite-lb-common] Initial import (#1001104).
František Dvořák
valtri at fedoraproject.org
Sun Sep 1 14:44:51 UTC 2013
commit c7264c44c41161cd8d8290ef83f32b35ec45e806
Author: František Dvořák <valtri at civ.zcu.cz>
Date: Sun Sep 1 16:45:09 2013 +0200
Initial import (#1001104).
.gitignore | 1 +
glite-lb-common.spec | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++
parallel.patch | 26 ++++++++++++++
pkg-config.patch | 93 +++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 215 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..c1c5d4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/glite-lb-common-9.0.7.tar.gz
diff --git a/glite-lb-common.spec b/glite-lb-common.spec
new file mode 100644
index 0000000..5956a71
--- /dev/null
+++ b/glite-lb-common.spec
@@ -0,0 +1,94 @@
+Name: glite-lb-common
+Version: 9.0.7
+Release: 2%{?dist}
+Summary: gLite Logging and Bookkeeping common library
+
+License: ASL 2.0
+Url: http://glite.cern.ch
+Source: http://scientific.zcu.cz/emi/emi.lb.common/%{name}-%{version}.tar.gz
+# https://github.com/CESNET/glite-lb/commit/3b759aea82451a9ce9808cb460666f6df34de398
+Patch0: pkg-config.patch
+# https://github.com/CESNET/glite-lb/commit/11037cf4934057c3eb463dab7893b26647ea4c4b
+Patch1: parallel.patch
+
+BuildRequires: c-ares-devel
+%if 0%{?rhel}
+BuildRequires: classads-devel
+%else
+BuildRequires: condor-classads-devel
+%endif
+BuildRequires: cppunit-devel
+BuildRequires: expat-devel
+BuildRequires: glite-jobid-api-cpp-devel
+BuildRequires: glite-jobid-api-c-devel
+BuildRequires: glite-lbjp-common-gss-devel
+BuildRequires: glite-lbjp-common-trio-devel
+BuildRequires: libtool
+BuildRequires: glite-lb-types
+BuildRequires: perl
+BuildRequires: perl(Getopt::Long)
+BuildRequires: perl(POSIX)
+BuildRequires: pkgconfig
+
+%description
+glite-lb-common is a package containing gLite LB common files shared by client
+and daemons. This package contains the LB common library.
+
+
+%package devel
+Summary: Development files for gLite L&B common library
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: glite-jobid-api-c-devel%{?_isa}
+Requires: glite-lb-types
+Requires: glite-lbjp-common-gss-devel%{?_isa}
+
+%description devel
+This package contains development libraries and header files for gLite L&B
+common library.
+
+
+%prep
+%setup -q
+%patch0 -p2
+%patch1 -p2
+
+
+%build
+perl ./configure --root=/ --prefix=%{_prefix} --libdir=%{_lib} --module lb.common
+CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make %{?_smp_mflags}
+
+
+%check
+CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make check
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%doc LICENSE project/ChangeLog
+%{_libdir}/libglite_lb_common.so.16
+%{_libdir}/libglite_lb_common.so.16.*
+
+%files devel
+%{_includedir}/glite/lb/*
+%{_libdir}/libglite_lb_common.so
+%{_libdir}/pkgconfig/*.pc
+
+
+%changelog
+* Sun Sep 01 2013 František Dvořák <valtri at civ.zcu.cz> - 9.0.7-2
+- replace the find command by wildcards
+- use the newer condor-classads-devel instead of classads on Fedora
+
+* Mon Aug 26 2013 František Dvořák <valtri at civ.zcu.cz> - 9.0.7-1
+- Initial package
diff --git a/parallel.patch b/parallel.patch
new file mode 100644
index 0000000..2d2dbab
--- /dev/null
+++ b/parallel.patch
@@ -0,0 +1,26 @@
+commit 11037cf4934057c3eb463dab7893b26647ea4c4b
+Author: František Dvořák <valtri at civ.zcu.cz>
+Date: Mon Aug 26 15:23:52 2013 +0200
+
+ Support parallel build in lb.common (missing dependency on generated header files).
+
+diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
+index 536fc49..7920001 100644
+--- a/org.glite.lb.common/Makefile
++++ b/org.glite.lb.common/Makefile
+@@ -273,13 +273,13 @@ distclean:
+ test_query_rec.o: query_rec.c
+ ${COMPILE} ${CFLAGS} -DGLITE_LB_QUERY_REC_TEST -c $< -o $@
+
+-%.o: %.c
++%.o: %.c ${GEN_HDRS}
+ ${COMPILE} ${CFLAGS} -c $<
+
+ il_int_test.o il_string_test.o il_test.o il_msg_test.o parse.o: %.o: %.cpp test_main.cpp
+ ${CXX} -c ${CFLAGS} ${CPPUNIT_CFLAGS} $<
+
+-%.thr.o: %.c
++%.thr.o: %.c ${GEN_HDRS}
+ ${COMPILE} ${CFLAGS} -D_REENTRANT -DGLITE_LB_THREADED -o $@ -c $<
+
+ %.h: %.h.T
diff --git a/pkg-config.patch b/pkg-config.patch
new file mode 100644
index 0000000..c21cdcd
--- /dev/null
+++ b/pkg-config.patch
@@ -0,0 +1,93 @@
+commit 3b759aea82451a9ce9808cb460666f6df34de398
+Author: František Dvořák <valtri at civ.zcu.cz>
+Date: Fri Aug 9 13:39:37 2013 +0200
+
+ pkg-config files for L&B common and client libraries.
+
+diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
+index ab9b49c..81a911c 100644
+--- a/org.glite.lb.common/Makefile
++++ b/org.glite.lb.common/Makefile
+@@ -20,7 +20,7 @@ version=${module.version}
+
+ jobiddir=${top_srcdir}/../org.glite.jobid.api-c
+
+-VPATH=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir}/doc
++VPATH=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir}/doc:${top_srcdir}/project
+ AT3=${stagedir}${prefix}/bin/glite-lb-at3
+
+ SUFFIXES = .T
+@@ -32,7 +32,7 @@ SOURCES=\
+ examples/perf_*.log \
+ interface/*.h interface/*.h.T \
+ m4/*.m4 \
+- project/.post* \
++ project/.post* project/*.pc.in \
+ src/*.c src/*.c.T src/*.sh \
+ test/*.c test/*.cpp test/*.cpp.T \
+ Makefile
+@@ -129,6 +129,8 @@ lib_LIBRARIES=${NOTHRSTATICLIB} ${THRSTATICLIB}
+ default_commonlib=${NOTHRLTLIB}
+ endif
+
++PKG_CONFIG_FILES=common.pc
++
+ ifdef LB_PERF
+ STAGE_PERFTEST=mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/perftest; \
+ ${INSTALL} -m 644 ${top_srcdir}/examples/*.log ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/perftest; \
+@@ -142,7 +144,7 @@ generate: ${GEN_HDRS}
+ common_version.h: ${top_srcdi${top_srcdir}/project/version.properties
+ echo "#define GLITE_LB_COMMON_VERSION \"${version}\"" >$@
+
+-all compile: generate ${lib_LTLIBRARIES} ${lib_LIBRARIES}
++all compile: generate ${lib_LTLIBRARIES} ${lib_LIBRARIES} ${PKG_CONFIG_FILES}
+
+ # In order to use libtool versioning correcty, we must have:
+ #
+@@ -243,7 +245,7 @@ olddoc: generate events.tex status.tex
+ doxygen CPP.dox
+
+ install:
+- mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}
++ mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}/pkgconfig
+ # mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
+ ${INSTALL} -m 755 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}
+ # cp -r C CPP ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
+@@ -255,10 +257,11 @@ install:
+ mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/glite/wmsutils/jobid ; \
+ ${INSTALL} -m 644 glite/wmsutils/jobid/*.h ${DESTDIR}${PREFIX}${prefix}/include/glite/wmsutils/jobid/ ; \
+ fi ;
++ ${INSTALL} -m 644 common.pc ${DESTDIR}${PREFIX}${prefix}/${libdir}/pkgconfig/glite-lb-common.pc
+ ${STAGE_PERFTEST} ;
+
+ clean:
+- rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/
++ rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/ *.pc
+ rm -fv test_parse il_test parse.cpp events.tex status.tex test_query_rec padding
+ rm -rvf ${REPORTS}
+ rm -rvf dist ${package}-*.tar.gz
+@@ -298,4 +301,7 @@ il_int_test.o il_string_test.o il_test.o il_msg_test.o parse.o: %.o: %.cpp test_
+ ${AT3} $< >$@ || ( rm -f $@; false )
+ chmod -w $@ >/dev/null
+
++%.pc: %.pc.in
++ sed -e "s, at PREFIX@,${PREFIX}${prefix}," -e "s/@VERSION@/${version}/" -e "s/@LIBDIR@/${libdir}/" $< > $@
++
+ .PHONY: default all generate compile stage check mkreports check.parse check.il testcoverage doc olddoc install clean distclean dist distcheck
+diff --git a/org.glite.lb.common/project/common.pc.in b/org.glite.lb.common/project/common.pc.in
+new file mode 100644
+index 0000000..e6a92f2
+--- /dev/null
++++ b/org.glite.lb.common/project/common.pc.in
+@@ -0,0 +1,11 @@
++prefix=@PREFIX@
++exec_prefix=${prefix}
++libdir=/usr/@LIBDIR@
++includedir=${prefix}/include
++
++Name: gLite Logging and Bookkeeping common library
++Description: gLite L&B common files shared by client and daemons
++Version: @VERSION@
++Requires: glite-security-gss
++Libs: -L${libdir} -lglite_lb_common
++Cflags: -I${includedir}
diff --git a/sources b/sources
index e69de29..dc4e747 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+baa2e16b2f30bfbdb67d20ca9d6c7c3b glite-lb-common-9.0.7.tar.gz
More information about the scm-commits
mailing list