[Jpackage-commits] dist/svn-javahl/devel svn-javahl.spec,1.1,1.2

David Walluck david at ryu.zarb.org
Tue Jul 14 19:13:59 CEST 2009


Update of /home/projects/jpackage/cvs/dist/svn-javahl/devel
In directory ryu.zarb.org:/tmp/cvs-serv8368

Modified Files:
	svn-javahl.spec 
Log Message:
- remove Mandrivaisms

Index: svn-javahl.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/svn-javahl/devel/svn-javahl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** svn-javahl.spec	14 Jul 2009 16:54:09 -0000	1.1
--- svn-javahl.spec	14 Jul 2009 17:13:57 -0000	1.2
***************
*** 1,10 ****
! %define section         free
! %define gcj_support     1
  
  Name:           svn-javahl
  Version:        1.4.2
! Release:        %mkrel 1
  Summary:        Java bindings for Subversion
! License:        BSD-style
  Group:          Development/Java
  URL:            http://subversion.tigris.org/
--- 1,39 ----
! # Copyright (c) 2000-2009, JPackage Project
! # All rights reserved.
! #
! # Redistribution and use in source and binary forms, with or without
! # modification, are permitted provided that the following conditions
! # are met:
! #
! # 1. Redistributions of source code must retain the above copyright
! #    notice, this list of conditions and the following disclaimer.
! # 2. Redistributions in binary form must reproduce the above copyright
! #    notice, this list of conditions and the following disclaimer in the
! #    documentation and/or other materials provided with the
! #    distribution.
! # 3. Neither the name of the JPackage Project nor the names of its
! #    contributors may be used to endorse or promote products derived
! #    from this software without specific prior written permission.
! #
! # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
! # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
! # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
! # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
! # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
! # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
! # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
! # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
! # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
! #
! 
! %define section free
  
  Name:           svn-javahl
  Version:        1.4.2
! Release:        2%{?dist}
  Summary:        Java bindings for Subversion
! License:        BSD
  Group:          Development/Java
  URL:            http://subversion.tigris.org/
***************
*** 17,41 ****
  BuildRequires:  db4-devel
  BuildRequires:  libtool >= 1.4.2
- %if %{mdkversion} < 200610
  BuildRequires:  neon-devel >= 0.24.7
- %else
- BuildRequires:  neon-devel >= 0.26
- %endif
  BuildRequires:  apache-devel
  BuildRequires:  apr-devel >= 1.2.2
  BuildRequires:  apr-util-devel >= 1.2.2
  BuildRequires:  swig-devel >= 1.3.27
- %if %{gcj_support}
- Requires(post): java-gcj-compat
- Requires(postun): java-gcj-compat
- BuildRequires:  java-gcj-compat-devel
- %else
  BuildRequires:  java-devel
- %endif
  BuildRequires:  jpackage-utils
  BuildRequires:  junit
- Provides:       java-subversion = %{version}-%{release}
- Obsoletes:      java-svn
- Provides:       java-svn = %{version}-%{release}
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
--- 46,57 ----
***************
*** 84,89 ****
     --with-junit=%{_javadir}/junit.jar \
     --enable-shared 
! %{make} javahl_javadir=%{_javadir}
! %{make} javahl javahl_javadir=%{_javadir}
  
  (cd subversion/bindings/java/javahl/src && %{__mkdir_p} ../javadoc && %{javadoc} -all -d ../javadoc org.tigris.subversion)
--- 100,105 ----
     --with-junit=%{_javadir}/junit.jar \
     --enable-shared 
! %{__make} %{_smp_mflags} javahl_javadir=%{_javadir}
! %{__make} %{_smp_mflags} javahl javahl_javadir=%{_javadir}
  
  (cd subversion/bindings/java/javahl/src && %{__mkdir_p} ../javadoc && %{javadoc} -all -d ../javadoc org.tigris.subversion)
***************
*** 103,115 ****
  
  %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__cp} -a subversion/bindings/java/javahl/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
  %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  %{_bindir}/chrpath -d %{buildroot}%{_libdir}/libsvnjavahl-1.so
  
- %if %{gcj_support}
- %{_bindir}/aot-compile-rpm
- %endif
- 
  %clean
  %{__rm} -rf %{buildroot}
--- 119,127 ----
  
  %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__cp} -pt subversion/bindings/java/javahl/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
  %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  %{_bindir}/chrpath -d %{buildroot}%{_libdir}/libsvnjavahl-1.so
  
  %clean
  %{__rm} -rf %{buildroot}
***************
*** 121,141 ****
  %endif
  
- %if %{gcj_support}
- %post
- %{update_gcjdb}
- 
- %postun
- %{clean_gcjdb}
- %endif
- 
- %post javadoc
- %{__rm} -f %{_javadocdir}/%{name}
- %{__ln_s} %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ $1 -eq 0 ]; then
-   %{__rm} -f %{_javadocdir}/%{name}
- fi
- 
  %files
  %defattr(0644,root,root,0755)
--- 133,136 ----
***************
*** 144,162 ****
  %{_javadir}/%{name}-%{version}.jar
  %attr(0755,root,root) %{_libdir}/libsvnjavahl-1.so
- %if %{gcj_support}
- %dir %{_libdir}/gcj/%{name}
- %attr(-,root,root) %{_libdir}/gcj/%{name}/*
- %endif
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
! 
  
  %changelog
! * Mon Dec 18 2006 David Walluck <walluck at mandriva.org> 1.4.2-1mdv2007.0
! + Revision: 98937
! - fix BuildRequires
! - Import svn-javahl
! 
--- 139,149 ----
  %{_javadir}/%{name}-%{version}.jar
  %attr(0755,root,root) %{_libdir}/libsvnjavahl-1.so
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
! * Mon Jul 14 2009 David Walluck <walluck at mandriva.org> 1.4.2-2
! - release




More information about the JPackage-commits mailing list