From c0923f89c112bfdbd92a3eaf7fa99f57b588cafd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 26 Mar 2013 11:32:14 +0100 Subject: [PATCH] Conditional build of trustmanager in rpm packaging, disable trustmanager on Debian. --- org.glite.lb.client-java/project/debian.control | 12 ++---------- .../project/debian.glite-lb-client-java-examples.dirs | 1 - .../project/debian.glite-lb-client-java-examples.install | 1 - org.glite.lb.client-java/project/debian.rules | 5 +---- org.glite.lb.client-java/project/glite-lb-client-java.spec | 14 ++++++++++++++ 5 files changed, 17 insertions(+), 16 deletions(-) delete mode 100644 org.glite.lb.client-java/project/debian.glite-lb-client-java-examples.dirs delete mode 100644 org.glite.lb.client-java/project/debian.glite-lb-client-java-examples.install diff --git a/org.glite.lb.client-java/project/debian.control b/org.glite.lb.client-java/project/debian.control index c5d8d94..b10de90 100644 --- a/org.glite.lb.client-java/project/debian.control +++ b/org.glite.lb.client-java/project/debian.control @@ -2,7 +2,7 @@ Source: glite-lb-client-java Priority: extra Maintainer: @MAINTAINER@ Uploaders: @UPLOADERS@ -Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk, emi-trustmanager, emi-trustmanager-axis, libglite-jobid-api-java, glite-lb-types, glite-lb-ws-interface, libaxis-java, libcommons-lang-java, liblog4j1.2-java, libtool +Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk, libglite-jobid-api-java, glite-lb-types, glite-lb-ws-interface, libaxis-java, libcommons-lang-java, liblog4j1.2-java, libtool Standards-Version: 3.9.1 Section: java Homepage: @URL@ @@ -19,18 +19,10 @@ Description: @SUMMARY@ Package: libglite-lb-client-axis-java Section: java Architecture: all -Depends: ${misc:Depends}, emi-trustmanager-axis, emi-trustmanager, libglite-jobid-api-java, libcommons-lang-java, libglite-lb-client-java +Depends: ${misc:Depends}, libglite-jobid-api-java, libcommons-lang-java, libglite-lb-client-java Description: Axis 1.4 flavor of Java L&B client This package contains java L&B client library based on Axis 1.4. -Package: glite-lb-client-java-examples -Section: java -Architecture: all -Depends: ${misc:Depends}, emi-trustmanager-axis, emi-trustmanager, libglite-jobid-api-java, libglite-lb-client-java, libglite-lb-client-axis, liblog4j1.2-java -Description: Java L&B client examples - This package contains java L&B client examples for Axis 1.4. For the - communication is used trustmanager or pure SSL. - Package: libglite-lb-client-java-doc Section: doc Architecture: all diff --git a/org.glite.lb.client-java/project/debian.glite-lb-client-java-examples.dirs b/org.glite.lb.client-java/project/debian.glite-lb-client-java-examples.dirs deleted file mode 100644 index 13c9f03..0000000 --- a/org.glite.lb.client-java/project/debian.glite-lb-client-java-examples.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/java diff --git a/org.glite.lb.client-java/project/debian.glite-lb-client-java-examples.install b/org.glite.lb.client-java/project/debian.glite-lb-client-java-examples.install deleted file mode 100644 index c3ddf73..0000000 --- a/org.glite.lb.client-java/project/debian.glite-lb-client-java-examples.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/java/glite-lb-client-java-examples.jar diff --git a/org.glite.lb.client-java/project/debian.rules b/org.glite.lb.client-java/project/debian.rules index d58c694..a1ddc9e 100644 --- a/org.glite.lb.client-java/project/debian.rules +++ b/org.glite.lb.client-java/project/debian.rules @@ -7,7 +7,6 @@ p_base=glite-lb-client-java p_lib=libglite-lb-client-java p_axis=libglite-lb-client-axis-java p_doc=libglite-lb-client-java-doc -p_examples=glite-lb-client-java-examples # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 @@ -15,7 +14,7 @@ export DH_VERBOSE=1 configure: configure-stamp configure-stamp: dh_testdir - /usr/bin/perl ./configure --thrflavour= --nothrflavour= --root=/ --prefix=/usr --libdir=lib --project=emi --module lb.client-java + /usr/bin/perl ./configure --thrflavour= --nothrflavour= --root=/ --prefix=/usr --libdir=lib --project=emi --module lb.client-java --with-trustmanager=no touch $@ build: build-indep @@ -44,11 +43,9 @@ install: build-stamp $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp mkdir -p debian/$(p_axis)/usr/share/doc mkdir -p debian/$(p_doc)/usr/share/doc - mkdir -p debian/$(p_examples)/usr/share/doc mkdir -p debian/$(p_lib)/usr/share/doc mv debian/tmp/usr/share/doc/$(p_base)-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_doc)/usr/share/doc/$(p_lib) ln -s $(p_lib) debian/$(p_axis)/usr/share/doc/$(p_axis) - ln -s $(p_lib) debian/$(p_examples)/usr/share/doc/$(p_examples) rm -vf debian/tmp/usr/lib/*.la rm -vf debian/tmp/usr/lib/*.a diff --git a/org.glite.lb.client-java/project/glite-lb-client-java.spec b/org.glite.lb.client-java/project/glite-lb-client-java.spec index a103dec..9aeff14 100644 --- a/org.glite.lb.client-java/project/glite-lb-client-java.spec +++ b/org.glite.lb.client-java/project/glite-lb-client-java.spec @@ -1,3 +1,5 @@ +%global with_trustmanager 0 + Name: glite-lb-client-java Version: @MAJOR@.@MINOR@.@REVISION@ Release: @AGE@%{?dist} @@ -17,8 +19,10 @@ BuildRequires: axis BuildRequires: axis1.4 %endif BuildRequires: chrpath +%if %{with_trustmanager} BuildRequires: emi-trustmanager BuildRequires: emi-trustmanager-axis +%endif BuildRequires: glite-jobid-api-java BuildRequires: glite-lb-types BuildRequires: glite-lb-ws-interface @@ -39,8 +43,10 @@ Requires: jpackage-utils Summary: Axis 1.4 flavor of Java L&B client Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +%if %{with_trustmanager} Requires: emi-trustmanager-axis Requires: emi-trustmanager +%endif Requires: glite-jobid-api-java Requires: jakarta-commons-lang Requires: jpackage-utils @@ -52,6 +58,7 @@ BuildArch: noarch This package contains java L&B client library based on Axis 1.4. +%if %{with_trustmanager} %package examples Summary: Java L&B client examples Group: Applications/Communications @@ -69,6 +76,7 @@ BuildArch: noarch %description examples This package contains java L&B client examples for Axis 1.4. For the communication is used trustmanager or pure SSL. +%endif %package javadoc @@ -91,6 +99,10 @@ L&B client. %build /usr/bin/perl ./configure --thrflavour= --nothrflavour= --root=/ --prefix=%{_prefix} --libdir=%{_lib} --project=emi --module lb.client-java --with-axis=/usr/local/axis1.4 +if [ "%with_trustmanager" == "0" ]; then + echo >> Makefile.inc + echo "trustmanager_prefix=no" >> Makefile.inc +fi CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make @@ -132,9 +144,11 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_javadir}/%{name}-axis.jar +%if %{with_trustmanager} %files examples %defattr(-,root,root) %{_javadir}/%{name}-examples.jar +%endif %files javadoc %defattr(-,root,root) -- 1.8.2.3