[glite-lbjp-common-log] Initial import (#885703).
František Dvořák
valtri at fedoraproject.org
Mon Aug 26 14:58:02 UTC 2013
commit cbab07cd46c1c2f7b0a62deef38326f03d952b2d
Author: František Dvořák <valtri at civ.zcu.cz>
Date: Mon Aug 26 16:58:48 2013 +0200
Initial import (#885703).
.gitignore | 1 +
cflags.patch | 24 +++++++++
docdir.patch | 122 ++++++++++++++++++++++++++++++++++++++++++++
glite-lbjp-common-log.spec | 89 ++++++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 237 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..6661e35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/glite-lbjp-common-log-1.3.8.tar.gz
diff --git a/cflags.patch b/cflags.patch
new file mode 100644
index 0000000..af3e75b
--- /dev/null
+++ b/cflags.patch
@@ -0,0 +1,24 @@
+commit 305f8d703b6e69e62529eabfb7a9bd689d981d09
+Author: František Dvořák <valtri at civ.zcu.cz>
+Date: Wed Jul 3 22:25:54 2013 +0200
+
+ Take precedence to CFLAGS from package system.
+
+diff --git a/org.glite.lbjp-common.log/Makefile b/org.glite.lbjp-common.log/Makefile
+index ef07d12..2a865da 100644
+--- a/org.glite.lbjp-common.log/Makefile
++++ b/org.glite.lbjp-common.log/Makefile
+@@ -34,11 +34,10 @@ LOG4C_LIBS:=-L${log4c_prefix}/${libdir} -L${log4c_prefix}/lib -llog4c
+
+ DEBUG:=-g -O0 -W -Wall
+
+-CFLAGS:= ${CFLAGS} \
+- ${DEBUG} \
++CFLAGS:= ${DEBUG} \
+ -I${stagedir}${prefix}/include -I${top_srcdir}/src \
+ -I${top_srcdir}/interface \
+- ${LOG4C_CFLAGS}
++ ${LOG4C_CFLAGS} ${CFLAGS}
+
+ LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir}
+
diff --git a/docdir.patch b/docdir.patch
new file mode 100644
index 0000000..35cc0c3
--- /dev/null
+++ b/docdir.patch
@@ -0,0 +1,122 @@
+commit f071d9e03fd91b3e838fec677a3fd356074343eb
+Author: František Dvořák <valtri at civ.zcu.cz>
+Date: Thu Aug 22 10:25:32 2013 +0200
+
+ Update RPM packaging of documentation (Fedora review #885703).
+
+diff --git a/org.glite.lb/configure b/org.glite.lb/configure
+index 5f9fc40..02b98bb 100755
+--- a/org.glite.lb/configure
++++ b/org.glite.lb/configure
+@@ -57,6 +57,7 @@ my $url = $default_url;
+ my $url_rpm;
+ my $url_deb;
+ my $url_source;
++my $docdir;
+ my $pkg_config_env = (defined $ENV{PKG_CONFIG_PATH}) ? "$ENV{PKG_CONFIG_PATH}:" : '';
+
+ my @nodes = qw/client server logger logger-msg nagios utils client-java doc ws-test db jpprimary jpindex jpclient harvester lb px proxyrenewal canl/;
+@@ -263,6 +264,7 @@ my @opts = (
+ 'url-rpm=s' => \$url_rpm,
+ 'url-deb=s' => \$url_deb,
+ 'url-source=s' => \$url_source,
++ 'docdir=s' => \$docdir,
+ );
+
+ for (@nodes) {
+@@ -1191,6 +1193,20 @@ canl.c
+ symlink "$top_srcdir/Makefile",$build."Makefile" or die "symlink $top_srcdir/Makefile ".$build."Makefile: $!\n";
+ }
+
++ # package name
++ my $dh;
++ opendir $dh, "$abs_srcdir/project" || die "Can't open $abs_srcdir/project: $!";
++ for my $dir (readdir $dh) {
++ if ($dir=~/^(.*)\.spec$/) {
++ if ($1 ne $packageName) {
++ printf STDERR "Changed RPM name: $packageName --> $1\n" if ($debug);;
++ $packageName=$1;
++ }
++ last;
++ }
++ }
++ closedir $dh;
++
+ open MKINC,">".$build."Makefile.inc"
+ or die $build."Makefile.inc: $!\n";
+
+@@ -1209,6 +1225,15 @@ nothrflavour = $nothrflavour
+ libdir = $libdir
+ top_srcdir = $top_srcdir
+ };
++ if ($docdir) {
++ my $d = $docdir;
++ $d =~ s/\$\{prefix\}/$prefix/g;
++ $d =~ s/\$\{moduleName\}/$full/g;
++ $d =~ s/\$\{packageName\}/$packageName/g;
++ $d =~ s/\$\{version\}/$major.$minor.$rev/g;
++ $d =~ s/\$\{age\}/$age/g;
++ print MKINC "docdir = $d\n";
++ }
+
+ for (@{$need_externs{$short}}) {
+ next unless defined $externs{$_} and defined $externs{$_}{prefix};
+@@ -1276,21 +1301,8 @@ deb: ${package}-${version}.tar.gz
+
+ close MKINC;
+
+- my $dh;
+ my $debian = 0;
+
+- opendir $dh, "$abs_srcdir/project" || die "Can't open $abs_srcdir/project: $!";
+- for my $dir (readdir $dh) {
+- if ($dir=~/^(.*)\.spec$/) {
+- if ($1 ne $packageName) {
+- printf STDERR "Changed RPM name: $packageName --> $1\n" if ($debug);;
+- $packageName=$1;
+- }
+- last;
+- }
+- }
+- closedir $dh;
+-
+ for my $file ("$packageName.spec", "debian.rules", "debian.control", "debian.changelog", "debian.copyright") {
+ if (-f "$abs_srcdir/project/$file") {
+ my $old_ = $_;
+@@ -1533,6 +1545,7 @@ General options (defaults in []):
+ --sysroot=DIR system root (custom relocation root -> sysroot) []
+ --sysconfdir=DIR system configuration directory [PREFIX/etc]
+ --localstatedir=DIR system local status directory [PREFIX/var]
++ --docdir documentation directory []
+ --os-type=DIST system type (debian/redhat/fedora)
+ --staged=module,module,... what is already in PREFIX (specify without org.glite.)
+ --thrflavour=flavour
+diff --git a/org.glite.lbjp-common.log/Makefile b/org.glite.lbjp-common.log/Makefile
+index 2a865da..20f390a 100644
+--- a/org.glite.lbjp-common.log/Makefile
++++ b/org.glite.lbjp-common.log/Makefile
+@@ -18,6 +18,7 @@ default: all
+ -include ${top_srcdir}/project/version.properties
+
+ version=${module.version}
++docdir?=${prefix}/share/doc/${package}-${version}
+
+ CC=gcc
+ VPATH=${top_srcdir}/interface:${top_srcdir}/src:${top_srcdir}/tests
+@@ -74,12 +75,12 @@ stage: compile
+ install: compile
+ mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix}
+ ${INSTALL} -m 644 ${top_srcdir}/src/log.h ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix}
+- mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
+- ${INSTALL} -m 644 ${top_srcdir}/README ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
++ mkdir -p ${DESTDIR}${PREFIX}${docdir}
++ ${INSTALL} -m 644 ${top_srcdir}/README ${DESTDIR}${PREFIX}${docdir}
+ mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb
+ ${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb/log4crc
+- ${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/log4crc.example-production
+- ${INSTALL} -m 644 ${top_srcdir}/config/log4crc.debugging ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/log4crc.example-debugging
++ ${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${DESTDIR}${PREFIX}${docdir}/log4crc.example-production
++ ${INSTALL} -m 644 ${top_srcdir}/config/log4crc.debugging ${DESTDIR}${PREFIX}${docdir}/log4crc.example-debugging
+ mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}
+ ${INSTALL} -m 755 ${LTLIB} ${DESTDIR}${PREFIX}${prefix}/${libdir}/${LTLIB}
+
diff --git a/glite-lbjp-common-log.spec b/glite-lbjp-common-log.spec
new file mode 100644
index 0000000..3ea2ebf
--- /dev/null
+++ b/glite-lbjp-common-log.spec
@@ -0,0 +1,89 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
+Name: glite-lbjp-common-log
+Version: 1.3.8
+Release: 2%{?dist}
+Summary: Definitions of glite common logging formats for LB and JP
+
+License: ASL 2.0
+Url: http://glite.cern.ch
+Source: http://scientific.zcu.cz/emi/emi.lbjp-common.log/%{name}-%{version}.tar.gz
+# https://github.com/CESNET/glite-lb/commit/305f8d703b6e69e62529eabfb7a9bd689d981d09
+Patch0: cflags.patch
+# https://github.com/CESNET/glite-lb/commit/f071d9e03fd91b3e838fec677a3fd356074343eb#diff-6
+# https://github.com/CESNET/glite-lb/commit/96e6731ab897ceaf79d2ed839fccf2f21ceb8dcf#diff-11
+Patch1: docdir.patch
+
+BuildRequires: libtool
+BuildRequires: log4c-devel
+BuildRequires: perl
+BuildRequires: perl(Getopt::Long)
+BuildRequires: perl(POSIX)
+BuildRequires: pkgconfig
+
+%description
+Definitions of glite common logging formats for LB and JP.
+
+%package devel
+Summary: Development files for gLite L&B/JP common log module
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+This package contains development libraries and header files for gLite L&B/JP
+common log module.
+
+
+%prep
+%setup -q
+%patch0 -p2
+%patch1 -p2
+
+
+%build
+perl ./configure --root=/ --prefix=%{_prefix} --libdir=%{_lib} --docdir=%{_pkgdocdir} --module lbjp-common.log
+CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make
+
+
+%check
+CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make check
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+install -m 0644 LICENSE project/ChangeLog $RPM_BUILD_ROOT%{_pkgdocdir}
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
+find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
+
+
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%dir %{_pkgdocdir}/
+%dir %{_sysconfdir}/glite-lb
+%config(noreplace) %{_sysconfdir}/glite-lb/log4crc
+%doc %{_pkgdocdir}/ChangeLog
+%doc %{_pkgdocdir}/LICENSE
+%doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/log4crc.example-debugging
+%doc %{_pkgdocdir}/log4crc.example-production
+%{_libdir}/libglite_lbu_log.so.1
+%{_libdir}/libglite_lbu_log.so.1.*
+
+%files devel
+%dir %{_includedir}/glite
+%dir %{_includedir}/glite/lbu
+%{_includedir}/glite/lbu/log.h
+%{_libdir}/libglite_lbu_log.so
+
+
+%changelog
+* Thu Aug 22 2013 František Dvořák <valtri at civ.zcu.cz> - 1.3.8-2
+- Removed arch-specific BuildRequires
+- Updated packaging of documentation
+
+* Wed Jul 03 2013 František Dvořák <valtri at civ.zcu.cz> - 1.3.8-1
+- Initial package
diff --git a/sources b/sources
index e69de29..5dc557d 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+e53588531dce167eb3e1c9b91b040082 glite-lbjp-common-log-1.3.8.tar.gz
More information about the scm-commits
mailing list