[glite-lb-client-java/el6: 11/11] Merge branch 'master' into el6.

[František Dvořák]

commit 505d9761a39a1f22c416aaca2baf8064c4e38456
Merge: 81a9156 23a4453
Author: František Dvořák <valtri at civ.zcu.cz>
Date:   Fri Jun 27 22:52:57 2014 +0200

    Merge branch 'master' into el6.

 .gitignore                |    2 +
 cflags.diff               |   23 ------
 glite-lb-client-java.spec |   49 +++++-------
 jni-path.diff             |  182 ---------------------------------------------
 ppc64.diff                |   28 -------
 sources                   |    2 +-
 6 files changed, 24 insertions(+), 262 deletions(-)
---
diff --cc glite-lb-client-java.spec
index a9fbcc7,1cc3f95..db93086
--- a/glite-lb-client-java.spec
+++ b/glite-lb-client-java.spec
@@@ -1,23 -1,18 +1,17 @@@
  %global groupId     org.glite
  %global artifactId  lb-client-java
 +%{!?_mavenpomdir: %global _mavenpomdir %{_datadir}/maven2/poms}
  
  Name:           glite-lb-client-java
- Version:        2.0.5
- Release:        2%{?dist}
+ Version:        2.0.7
+ Release:        1%{?dist}
  Summary:        JAVA implementation of the L&B service client
  
  License:        ASL 2.0
- Url:            http://glite.cern.ch
+ URL:            http://glite.cern.ch
  Source:         http://scientific.zcu.cz/emi/emi.lb.client-java/%{name}-%{version}.tar.gz
- # https://github.com/CESNET/glite-lb/commit/87a0635b69b5d8880e0b5f3e394ed4cfc8248dae
- Patch0:         jni-path.diff
- # https://github.com/CESNET/glite-lb/commit/ae20182764b39c2cdfffba20b4be1ffc9ccd3e6a
- Patch1:         cflags.diff
- # https://github.com/CESNET/glite-lb/commit/b84862df75991212b6a374b872894ca6a5c067d0
- Patch2:         ppc64.diff
  
  BuildRequires:  ant
 -BuildRequires:  apache-commons-lang
 -BuildRequires:  axis
  BuildRequires:  glite-jobid-api-java
  BuildRequires:  glite-lb-types
  BuildRequires:  glite-lb-ws-interface
@@@ -56,41 -61,32 +50,39 @@@ L&B client
  
  
  %build
- perl ./configure --root=/ --prefix=%{_prefix} --libdir=%{_lib} --module lb.client-java --with-axis=no --with-trustmanager=no
 -perl ./configure --root=/ --prefix=%{_prefix} --libdir=%{_lib} --with-trustmanager=no
++perl ./configure --root=/ --prefix=%{_prefix} --libdir=%{_lib} --with-axis=no --with-trustmanager=no
  # parallel build not supported
  CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make LOADER_SOURCES=JNIFedoraLoader.java
  
  
  %install
- make install DESTDIR=$RPM_BUILD_ROOT
+ make install DESTDIR=%{buildroot}
  # move API docs
- mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
- mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+ mkdir -p %{buildroot}%{_javadocdir}
+ mv %{buildroot}%{_docdir}/%{name}-%{version}/api %{buildroot}%{_javadocdir}/%{name}
  # move JNI
- mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
- mv $RPM_BUILD_ROOT%{_libdir}/libglite_lb_sendviasocket.so* $RPM_BUILD_ROOT%{_libdir}/%{name}
+ mkdir -p %{buildroot}%{_libdir}/%{name}
+ mv %{buildroot}%{_libdir}/libglite_lb_sendviasocket.so* %{buildroot}%{_libdir}/%{name}
  # move JAR (using JNI)
- mkdir -p $RPM_BUILD_ROOT%{_jnidir}
- mv $RPM_BUILD_ROOT%{_javadir}/%{name}.jar $RPM_BUILD_ROOT%{_jnidir}
- rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
- rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
- mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
- install -m 0644 JPP-%{name}.pom $RPM_BUILD_ROOT%{_mavenpomdir}
+ mkdir -p %{buildroot}%{_jnidir}
+ mv %{buildroot}%{_javadir}/%{name}.jar %{buildroot}%{_jnidir}
+ rm -f %{buildroot}%{_libdir}/*.a
+ rm -f %{buildroot}%{_libdir}/*.la
+ mkdir -p %{buildroot}%{_mavenpomdir}
 -install -m 0644 JPP-%{name}.pom JPP-%{name}-axis.pom %{buildroot}%{_mavenpomdir}
 -%add_maven_depmap JPP-%{name}.pom %{name}.jar
 -%add_maven_depmap JPP-%{name}-axis.pom %{name}-axis.jar -f axis
++install -m 0644 JPP-%{name}.pom %{buildroot}%{_mavenpomdir}
 +%add_to_maven_depmap %{groupId} %{artifactId} %{version} JPP %{name}
++touch .mfiles
 +
 +
 +%post
 +%update_maven_depmap
 +
 +%postun
 +%update_maven_depmap
  
  
- %files
- %doc LICENSE project/ChangeLog
+ %files -f .mfiles
+ %doc ChangeLog LICENSE
  %dir %{_libdir}/%{name}/
  %{_libdir}/%{name}/libglite_lb_sendviasocket.so
  %{_libdir}/%{name}/libglite_lb_sendviasocket.so.0
@@@ -104,8 -99,30 +96,9 @@@
  
  
  %changelog
- * Wed Jan 15 2014 František Dvořák <valtri at civ.zcu.cz> - 2.0.5-1
- - Remove some jpackage-utils (Build)Requires (needed only for EPEL <= 6)
 -* Thu Jun 26 2014 František Dvořák <valtri at civ.zcu.cz> - 2.0.7-1
++* Fri Jun 27 2014 František Dvořák <valtri at civ.zcu.cz> - 2.0.7-1
+ - New release 2.0.7 (L&B 4.1.2)
+ - Consistent style with buildroot macro
 -- Axis timeout patch in upstream
 -
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.6-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
 -* Sat May 31 2014 František Dvořák <valtri at civ.zcu.cz> - 2.0.6-1
 -- Using .mfiles to build with javapackages 4.x
 -
 -* Fri May 30 2014 František Dvořák <valtri at civ.zcu.cz> - 2.0.6-1
 -- New release 2.0.6 (L&B 4.1.1)
 -- apache-commons-lang also in axis subpackage
 -
 -* Thu May 29 2014 Alexander Kurtakov <akurtako at redhat.com> 2.0.5-4
 -- Move from the old jakarta-commons-lang to new apache-commons-lang in BR/R.
 -
 -* Mon Feb 24 2014 František Dvořák <valtri at civ.zcu.cz> - 2.0.5-3
 -- Switch to java-headless (RB #1068107)
 -- Try to fix build on armhfp (increase timeout, event the network is not used)
 -
 -* Wed Jan 15 2014 František Dvořák <valtri at civ.zcu.cz> - 2.0.5-2
 -- Remove jpackage-utils (Build)Requires (needed only for EPEL <= 6)
  
  * Fri Jan 10 2014 František Dvořák <valtri at civ.zcu.cz> - 2.0.5-1
  - Initial package