[glite-lb-state-machine] Initial import (#1046513).

František Dvořák valtri at fedoraproject.org
Fri Jan 3 13:38:14 UTC 2014


commit 95402a159da5d7ab08ec3a933f2008df5c602760
Author: František Dvořák <valtri at civ.zcu.cz>
Date:   Fri Jan 3 14:39:35 2014 +0100

    Initial import (#1046513).

 .gitignore                  |    1 +
 glite-lb-state-machine.spec |  101 +++++++++++++++++++++++++++++++++++++++++++
 rpath.patch                 |   56 ++++++++++++++++++++++++
 sources                     |    1 +
 xsd-location.patch          |   27 +++++++++++
 5 files changed, 186 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..c4715cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/glite-lb-state-machine-2.0.7.tar.gz
diff --git a/glite-lb-state-machine.spec b/glite-lb-state-machine.spec
new file mode 100644
index 0000000..3eed898
--- /dev/null
+++ b/glite-lb-state-machine.spec
@@ -0,0 +1,101 @@
+Name:           glite-lb-state-machine
+Version:        2.0.7
+Release:        1%{?dist}
+Summary:        gLite Logging and Bookkeeping state machine
+
+License:        ASL 2.0
+Url:            http://glite.cern.ch
+Source:         http://scientific.zcu.cz/emi/emi.lb.state-machine/%{name}-%{version}.tar.gz
+# https://github.com/CESNET/glite-lb/commit/1a90b6d604d0fad741c6c917df3e9aef6f878b62#diff-4
+# https://github.com/CESNET/glite-lb/commit/652b72448181348741d262261c94bea3f21a15c3
+Patch0:         rpath.patch
+# https://github.com/CESNET/glite-lb/commit/57d4485632436a27a96e92f3908aedba5f43cdb4#diff-0
+Patch1:         xsd-location.patch
+
+%if 0%{?rhel}
+BuildRequires:  classads-devel
+%else
+BuildRequires:  condor-classads-devel
+%endif
+BuildRequires:  expat-devel
+BuildRequires:  glite-jobid-api-c-devel
+BuildRequires:  glite-lb-common-devel
+BuildRequires:  glite-lb-types
+BuildRequires:  glite-lbjp-common-db-devel
+BuildRequires:  glite-lbjp-common-gss-devel
+BuildRequires:  glite-lbjp-common-jp-interface-devel
+BuildRequires:  glite-lbjp-common-trio-devel
+BuildRequires:  libtool
+BuildRequires:  libxslt
+BuildRequires:  perl
+BuildRequires:  perl(Getopt::Long)
+BuildRequires:  perl(POSIX)
+BuildRequires:  pkgconfig
+
+%description
+glite-lb-state-machine is the gLite L&B job state machine -- server core
+processing L&B events to produce job state presented to the user. This package
+contains the state machine library (linked by server) and dynamic plugin (used
+by other tools and Job Provenance).
+
+
+%package        devel
+Summary:        Development files for gLite L&B state machine
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       glite-lb-common-devel%{?_isa}
+
+%description    devel
+This package contains development libraries and header files for gLite L&B
+state machine.
+
+
+%package        plugins
+Summary:        L&B state machine plugins
+
+%description    plugins
+This package contains L&B state machine plugins for L&B tools and Job
+Provenance.
+
+
+%prep
+%setup -q
+%patch0 -p2
+%patch1 -p2
+
+
+%build
+perl ./configure --root=/ --prefix=%{_prefix} --libdir=%{_lib} --module lb.state-machine
+CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make %{?_smp_mflags}
+
+
+%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_statemachine.so.6
+%{_libdir}/libglite_lb_statemachine.so.6.*
+
+%files devel
+%dir %{_datadir}/glite-lb/xsd/
+%{_includedir}/glite/lb/*.h
+%{_libdir}/libglite_lb_statemachine.so
+%{_datadir}/glite-lb/xsd/*.xsd
+
+%files plugins
+%{_libdir}/glite_lb_plugin.so
+%{_libdir}/glite_lb_plugin.so.*
+
+
+%changelog
+* Wed Dec 25 2013 František Dvořák <valtri at civ.zcu.cz> - 2.0.7-1
+- Initial package
diff --git a/rpath.patch b/rpath.patch
new file mode 100644
index 0000000..01f536c
--- /dev/null
+++ b/rpath.patch
@@ -0,0 +1,56 @@
+commit 1a90b6d604d0fad741c6c917df3e9aef6f878b62
+Author: František Dvořák <valtri at civ.zcu.cz>
+Date:   Sat Dec 7 17:05:36 2013 +0100
+
+    Use -rpath link flag only for libraries. With libtool files deleted (building RPM packages), RPATH field is not present in binary files.
+
+diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile
+index 44443c0..0fadfd1 100644
+--- a/org.glite.lb.state-machine/Makefile
++++ b/org.glite.lb.state-machine/Makefile
+@@ -49,11 +49,9 @@ CFLAGS:= \
+ 	-I${top_srcdir}/interface ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS}
+ 
+ COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
+-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir}  ${LDFLAGS} 
+-SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}${prefix}/${libdir}
+-LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
++LINK:=libtool --mode=link ${CC} ${LDFLAGS}
++SOLINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS}
+ INSTALL:=libtool --mode=install install
+-LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS}
+ XSLTPROC:=xsltproc --novalid
+ 
+ ifeq (${thrflavour},)
+@@ -92,10 +90,10 @@ version_info:=-version-info ${shell \
+         perl -e '$$,=":"; @F=split /\./,"${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
+ 
+ ${PLUGIN_LIB}: ${PLUGIN_LOBJS}
+-	${SOLINK} -o $@ ${PLUGIN_LOBJS} ${PLUGIN_LIBS}
++	${SOLINK} -module -o $@ ${PLUGIN_LOBJS} ${PLUGIN_LIBS}
+ 
+ ${MACHINE_LIB}:  ${MACHINE_OBJS}
+-	${LINK} ${version_info} -o $@ ${MACHINE_LOBJS} ${COMMON_LIBS}
++	${SOLINK} -o $@ ${MACHINE_LOBJS} ${COMMON_LIBS}
+ #	ar crv $@ ${MACHINE_OBJS}
+ #	-ranlib $@
+ 
+commit 652b72448181348741d262261c94bea3f21a15c3
+Author: František Dvořák <valtri at civ.zcu.cz>
+Date:   Sat Dec 7 18:07:29 2013 +0100
+
+    Return accidentally removed library version info.
+
+diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile
+index 0fadfd1..e3734c4 100644
+--- a/org.glite.lb.state-machine/Makefile
++++ b/org.glite.lb.state-machine/Makefile
+@@ -93,7 +93,7 @@ ${PLUGIN_LIB}: ${PLUGIN_LOBJS}
+ 	${SOLINK} -module -o $@ ${PLUGIN_LOBJS} ${PLUGIN_LIBS}
+ 
+ ${MACHINE_LIB}:  ${MACHINE_OBJS}
+-	${SOLINK} -o $@ ${MACHINE_LOBJS} ${COMMON_LIBS}
++	${SOLINK} ${version_info} -o $@ ${MACHINE_LOBJS} ${COMMON_LIBS}
+ #	ar crv $@ ${MACHINE_OBJS}
+ #	-ranlib $@
+ 
diff --git a/sources b/sources
index e69de29..58072f3 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+97373d5eda11fef069bac5cc237e2751  glite-lb-state-machine-2.0.7.tar.gz
diff --git a/xsd-location.patch b/xsd-location.patch
new file mode 100644
index 0000000..efcc600
--- /dev/null
+++ b/xsd-location.patch
@@ -0,0 +1,27 @@
+commit 57d4485632436a27a96e92f3908aedba5f43cdb4
+Author: František Dvořák <valtri at civ.zcu.cz>
+Date:   Sat Dec 21 17:36:27 2013 +0100
+
+    L&B state-machine packaging cleanups: move xsd files from /usr/interface to /usr/share/glite-lb/xsd, tune descriptions, removed directories already in required packages.
+
+diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile
+index e3734c4..5a8640f 100644
+--- a/org.glite.lb.state-machine/Makefile
++++ b/org.glite.lb.state-machine/Makefile
+@@ -104,12 +104,12 @@ stage: compile
+ 	$(MAKE) install PREFIX=${stagedir}
+ 
+ install:
+-	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} ${DESTDIR}${PREFIX}${prefix}/interface ${DESTDIR}${PREFIX}${prefix}/include/glite/lb
++	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} ${DESTDIR}${PREFIX}${prefix}/share/glite-lb/xsd ${DESTDIR}${PREFIX}${prefix}/include/glite/lb
+ 	${INSTALL} -m 755 ${MACHINE_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir}
+ 	${INSTALL} -m 755 ${PLUGIN_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir}
+-	install -m 644 ${top_srcdir}/interface/lb-job-attrs.xsd ${DESTDIR}${PREFIX}${prefix}/interface
+-	install -m 644 lb-job-attrs2.xsd ${DESTDIR}${PREFIX}${prefix}/interface
+-	install -m 644 ${top_srcdir}/interface/lb-job-record.xsd ${DESTDIR}${PREFIX}${prefix}/interface
++	install -m 644 ${top_srcdir}/interface/lb-job-attrs.xsd ${DESTDIR}${PREFIX}${prefix}/share/glite-lb/xsd
++	install -m 644 lb-job-attrs2.xsd ${DESTDIR}${PREFIX}${prefix}/share/glite-lb/xsd
++	install -m 644 ${top_srcdir}/interface/lb-job-record.xsd ${DESTDIR}${PREFIX}${prefix}/share/glite-lb/xsd
+ 	install -m 644 ${top_srcdir}/interface/intjobstat.h ${DESTDIR}${PREFIX}${prefix}/include/glite/lb
+ 	install -m 644 ${top_srcdir}/interface/intjobstat_supp.h ${DESTDIR}${PREFIX}${prefix}/include/glite/lb
+ 	install -m 644 ${top_srcdir}/interface/process_event.h ${DESTDIR}${PREFIX}${prefix}/include/glite/lb


More information about the scm-commits mailing list