[Jpackage-commits] dist/jna/JPP-5 jna-3.0.3.pom, 1.1, NONE jna.spec, 1.9, 1.10 sources, 1.1, 1.2

David Walluck david at ryu.zarb.org
Tue Jul 14 20:48:59 CEST 2009


Update of /home/projects/jpackage/cvs/dist/jna/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv30567

Modified Files:
	jna.spec sources 
Removed Files:
	jna-3.0.3.pom 
Log Message:
- 3.1.0

Index: jna.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jna/JPP-5/jna.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** jna.spec	30 Jun 2008 14:00:16 -0000	1.9
--- jna.spec	14 Jul 2009 18:48:57 -0000	1.10
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 29,76 ****
  #
  
! %define native %{?_with_native:1}%{!?_with_native:%{?_without_native:0}%{!?_without_native:%{?_native:%{_native}}%{!?_native:0}}}
  
! %define section   free
  
  Name:           jna
- Summary:        Java Native Access
  URL:            https://jna.dev.java.net/
  Group:          Development/Libraries/Java
! Version:        3.0.3
! Release:        4%{dist}
! License:        LGPL
! #Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
! #Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
! 
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel = 0:1.5.0
! BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-nodeps
  BuildRequires:  ant-junit
- BuildRequires:  junit
  BuildRequires:  ant-trax
! BuildRequires:  xalan-j2
! %if %{native}
! %define __find_provides true
! BuildRequires:  libX11-devel
! BuildRequires:  libXt-devel
! %endif
! 
! Requires:       java >= 0:1.5.0
! BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
! 
! Source0:        jna-3.0.3.tar.gz
! # svn export https://jna.dev.java.net/svn/jna/tags/3.0.3 jna-3.0.3 --username guest
! # password is void
! Source1:        %{name}-%{version}.pom
! Patch0:         %{name}-%{version}-build.patch
! 
! %if ! %{native}
  BuildArch:      noarch
  %endif
! 
! #Requires:         %{name}-native = %{epoch}:%{version}-%{release}
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
  
  %description
--- 29,66 ----
  #
  
! %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
! %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
! %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
! %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without native
! 
! %define section free
  
  Name:           jna
  URL:            https://jna.dev.java.net/
  Group:          Development/Libraries/Java
! Version:        3.1.0
! Release:        1%{?dist}
! Epoch:          0
! Summary:        Java Native Access
! License:        LGPLv2+
! # svn -q export https://jna.dev.java.net/svn/jna/tags/3.1.0 jna-3.1.0 --username guest --password "" && tar cjf jna-3.1.0.tar.bz2 jna-3.1.0
! Source0:        jna-3.1.0.tar.bz2
! Source1:        %{name}-%{version}.pom
! Patch0:         %{name}-%{version}-build.patch
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! Requires:       java >= 0:1.5.0
! BuildRequires:  ant
  BuildRequires:  ant-nodeps
  BuildRequires:  ant-junit
  BuildRequires:  ant-trax
! BuildRequires:  java-devel >= 0:1.5.0
! BuildRequires:  jpackage-utils >= 0:1.7.5
! %if %without native
  BuildArch:      noarch
  %endif
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  
  %description
***************
*** 84,87 ****
--- 74,78 ----
  required. While some attention is paid to performance,
  correctness and ease of use take priority.
+ 
  The JNA library uses a small native library stub to dynamically
  invoke native code. The developer uses a Java interface to
***************
*** 91,95 ****
  building JNI code for multiple platforms.
  
! %if %{native}
  %package        native
  Summary:        Native shared library %{name}
--- 82,86 ----
  building JNI code for multiple platforms.
  
! %if %with native
  %package        native
  Summary:        Native shared library %{name}
***************
*** 98,161 ****
  %description    native
  %{summary}.
! 
! %else
  
  %package        javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description    javadoc
  %{summary}.
- %endif
  
  %prep
  %setup -q 
! %patch0 -b .sav0
  
  %build
! unset CLASSPATH
! export JAVA_HOME=%{_jvmdir}/java-1.5.0
! export OPT_JAR_LIST="ant/ant-trax ant/ant-nodeps ant/ant-junit junit xalan-j2-serializer"
  cd jnalib
! %if %{native}
! %ant native
  %else
! %ant compile jar javadoc
  %endif
  
  %install
  rm -rf $RPM_BUILD_ROOT
! %if %{native}
  install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
! install -m 644 jnalib/build/native/libjnidispatch.so $RPM_BUILD_ROOT%{_libdir}/libjnidispatch.so
! %else
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 jnalib/build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  %add_to_maven_depmap com.sun.jna jna %{version} JPP %{name}
! install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr jnalib/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
! %endif
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
- %if ! %{native}
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-   rm -f %{_javadocdir}/%{name}
- fi
- 
  %post
  %update_maven_depmap
--- 89,142 ----
  %description    native
  %{summary}.
! %endif
  
  %package        javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description    javadoc
  %{summary}.
  
  %prep
  %setup -q 
! %patch0 -p1 -b .orig
  
  %build
! export CLASSPATH=
! export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/{junit,nodeps,trax}`"
  cd jnalib
! %if %with native
! %{ant} jar native compile-tests examples javadoc
  %else
! %{ant} jar compile-tests examples javadoc
  %endif
  
  %install
  rm -rf $RPM_BUILD_ROOT
! 
! if [ -d jnalib/build-d64 ]; then
! suffix="-d64"
! fi
! 
! %if %with native
  install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
! install -p -m 644 jnalib/build${suffix}/native/libjnidispatch.so $RPM_BUILD_ROOT%{_libdir}/libjnidispatch.so
! %endif
! 
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 jnalib/build${suffix}/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  %add_to_maven_depmap com.sun.jna jna %{version} JPP %{name}
! install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr jnalib/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
  %post
  %update_maven_depmap
***************
*** 163,187 ****
  %postun
  %update_maven_depmap
- %endif
  
- %if %{native}
- %files native
- %defattr(-,root,root)
- %{_libdir}/*.so*
- %else
  %files
! %defattr(-,root,root)
! %{_javadir}/*.jar
  %doc jnalib/release-notes.html jnalib/LICENSE.txt 
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  
  %files javadoc
! %defattr(-,root,root)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  %endif
  
  %changelog
  * Mon Jun 30 2008 Ralph Apel <r.apel at r-apel.de> - 0:3.0.3-4.jpp5
  - Prefix jar target with compile target
--- 144,171 ----
  %postun
  %update_maven_depmap
  
  %files
! %defattr(0644,root,root,0755)
  %doc jnalib/release-notes.html jnalib/LICENSE.txt 
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
! 
! %if %with native
! %files native
! %defattr(0755,root,root,0755)
! %{_libdir}/libjnidispatch.so
  %endif
  
  %changelog
+ * Tue Jul 14 2009 David Walluck <dwalluck at redhat.com> 0:3.1.0-1
+ - 3.1.0
+ 
  * Mon Jun 30 2008 Ralph Apel <r.apel at r-apel.de> - 0:3.0.3-4.jpp5
  - Prefix jar target with compile target
***************
*** 195,197 ****
  * Fri May 30 2008 Ralph Apel <r.apel at r-apel.de> - 0:3.0.3-1jpp
  - First release
- 
--- 179,180 ----

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jna/JPP-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	27 Jun 2008 10:49:26 -0000	1.1
--- sources	14 Jul 2009 18:48:57 -0000	1.2
***************
*** 1 ****
! 15c41d201d1278c71dd628d4bec2a118  jna-3.0.3.tar.gz
--- 1 ----
! 7e09dcfb9156450cde7b42c293a3fc28  jna-3.1.0.tar.bz2

--- jna-3.0.3.pom DELETED ---




More information about the JPackage-commits mailing list