rpms/jna/devel .cvsignore, 1.2, 1.3 jna.spec, 1.1, 1.2 sources, 1.2, 1.3 jna-3.0.2-dynlink-and-cflags.patch, 1.1, NONE

[Colin Walters (walters)]

Author: walters

Update of /cvs/pkgs/rpms/jna/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8188

Modified Files:
	.cvsignore jna.spec sources 
Removed Files:
	jna-3.0.2-dynlink-and-cflags.patch 
Log Message:
* Thu Jul 31 2008 Colin Walters <walters at redhat.com> - 3.0.4-1.svn630
- New upstream version, drop upstreamed patch parts
- New patch jna-3.0.4-nomixedjar.patch which ensures that we don't
  include the .so in the .jar



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Apr 2008 23:46:58 -0000	1.2
+++ .cvsignore	31 Jul 2008 18:33:15 -0000	1.3
@@ -1 +1 @@
-jna-3.0.2.tar.bz2
+jna-3.0.4.svn630.tar.bz2


Index: jna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/jna.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jna.spec	4 Apr 2008 23:46:58 -0000	1.1
+++ jna.spec	31 Jul 2008 18:33:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           jna
-Version:        3.0.2
-Release:        7%{?dist}
+Version:        3.0.4
+Release:        1.svn630%{?dist}
 Summary:        Pure Java access to native libraries
 
 Group:          Development/Libraries
@@ -10,12 +10,12 @@
 # following commands to generate the tarball:
 #   svn export https://jna.dev.java.net/svn/jna/tags/%{version}/jnalib/ --username guest jna-%{version}
 #   tar -cjf jna-%{version}.tar.bz2 jna-%{version}
-Source0:        %{name}-%{version}.tar.bz2
-# https://jna.dev.java.net/issues/show_bug.cgi?id=60
-Patch0:         jna-3.0.2-dynlink-and-cflags.patch
+Source0:        %{name}-%{version}.svn630.tar.bz2
 # This patch is Fedora-specific for now until we get the huge
 # JNI library location mess sorted upstream
 Patch1:         jna-3.0.2-loadlibrary.patch
+# Will send upstream...
+Patch2:         jna-3.0.4-nomixedjar.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  java-devel >= 1.6 ant jpackage-utils ant-nodeps
@@ -44,9 +44,9 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
+%setup -q -n %{name}-%{version}-svn630
 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH1} | patch -p1
+%patch2 -p1
 
 # all java binaries must be removed from the sources
 find . -name '*.jar' -exec rm -f '{}' \;
@@ -74,13 +74,13 @@
 rm -rf %{buildroot}
 
 # jars
-install -D -m 644 build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+install -D -m 644 build-*/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
 (cd %{buildroot}%{_javadir}/; for jar in `ls *-%{version}.jar`; do ln -s $jar `echo $jar | sed -e 's/-%{version}//'`; done)
 # NOTE: JNA has highly custom code to look for native jars in this
 # directory.  Since this roughly matches the jpackage guidelines,
 # we'll leave it unchanged.
 install -d -m 755 %{buildroot}%{_libdir}/%{name}
-install -m 755 build/native/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/
+install -m 755 build-*/native/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/
 
 # javadocs
 install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
@@ -103,6 +103,11 @@
 
 
 %changelog
+* Thu Jul 31 2008 Colin Walters <walters at redhat.com> - 3.0.4-1.svn630
+- New upstream version, drop upstreamed patch parts
+- New patch jna-3.0.4-nomixedjar.patch which ensures that we don't
+  include the .so in the .jar
+
 * Fri Apr 04 2008 Colin Walters <walters at redhat.com> - 3.0.2-7
 - Add patch to use JPackage-compatible JNI library path
 - Do build debuginfo package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Apr 2008 23:46:58 -0000	1.2
+++ sources	31 Jul 2008 18:33:15 -0000	1.3
@@ -1 +1 @@
-4f177e179adfdb3c2289c6f36445809f  jna-3.0.2.tar.bz2
+2a90fbade80d2a86d5cc967c5529cd34  jna-3.0.4.svn630.tar.bz2


--- jna-3.0.2-dynlink-and-cflags.patch DELETED ---