packages: java-jna/java-jna.spec - rename to java-jna (why add it to cvs wi...

Wed Dec 29 17:20:28 CET 2010

Author: glen                         Date: Wed Dec 29 16:20:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rename to java-jna (why add it to cvs with wrong name in first place?)

---- Files affected:
packages/java-jna:
   java-jna.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/java-jna/java-jna.spec
diff -u packages/java-jna/java-jna.spec:1.1 packages/java-jna/java-jna.spec:1.2

--- packages/java-jna/java-jna.spec:1.1	Wed Dec 29 16:18:58 2010
+++ packages/java-jna/java-jna.spec	Wed Dec 29 17:20:22 2010
@@ -1,39 +1,26 @@
 # $Revision$, $Date$
-# TODO: Renema to java-jna ?
+# TODO
+# - allow disable tests
+#
 # Conditional build:
-# %bcond_without	javadoc		# don't build javadoc
-%bcond_without	source		# don't build source jar
 %bcond_without	tests		# don't build and run tests
 
-%include	/usr/lib/rpm/macros.java
-
-# To force building with specific JDK implementation
-# without replacing currently installed /usr/bin/javac, etc.
-#%%define	use_jdk	java-gcj-compat
-#%%buildrequires_jdk
-#BuildRequires:	rpmbuild(macros) >= 1.556
-
-# Name without java- prefix. If it is application, not a library,
-# just do s/srcname/name/g
 %define		srcname		jna
+%define		snap		rev1177
+%include	/usr/lib/rpm/macros.java
 Summary:	Easy access to native shared libraries from Java
 Summary(pl.UTF-8):	Prosty dostęp do natywnych bibliotek dzielonych z poziomu Javy.
-
-Name:		jna
-Version:	3.2.7.0.rev1177
-Release:	0.1
+Name:		java-%{srcname}
+Version:	3.2.7.0
+Release:	0.%{snap}.1
 License:	LGPL
-# for random java packages (applications?)
-Group:		Development/Languages/Java
-# for java-XXX packages
 Group:		Libraries/Java
 # Source0:	https://jna.dev.java.net/source/browse/*checkout*/jna/tags/%{version}/jnalib/dist/src.zip
 # svn export https://jna.dev.java.net/svn/jna/tags/3.2.7/jnalib/ --username guest jna-3.2.7.0
 # mv  jna-3.2.7.0   jna-3.2.7.0.rev1177
-# tar cjf ~/rpm/packages/jna//jna-3.2.7.0.rev1177.tar.bz2 jna-3.2.7.0.rev1177/
-Source0:	%{name}-%{version}.tar.bz2
+# tar cjf ~/rpm/packages/jna/jna-3.2.7.0.rev1177.tar.bz2 jna-3.2.7.0.rev1177/
+Source0:	%{srcname}-%{version}.%{snap}.tar.bz2
 # Source0-md5:	ebfd892683335a3fd6da931938322f77
-
 URL:		https://jna.dev.java.net/
 %if %(locale -a | grep -q '^en_US$'; echo $?)
 BuildRequires:	glibc-localedb-all
@@ -43,13 +30,7 @@
 BuildRequires:	libffi-devel >= 4.5.2
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-# for %%undos macro
-BuildRequires:	rpmbuild(macros) >= 1.553
-%if %{with source}
-BuildRequires:	rpmbuild(macros) >= 1.555
-%endif
 BuildRequires:	sed >= 4.0
-# for %{_javadir}
 Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,24 +45,8 @@
 pisania czegokolwiek co nie jest kodem Javy. Nie potrzebne jest ani
 JNI ani fragmentu kodu natywnego.
 
-
-
-%package source
-Summary:	Source code of %{srcname}
-Summary(pl.UTF-8):	Kod źródłowy %{srcname}
-Group:		Documentation
-Requires:	jpackage-utils >= 1.7.5-2
-
-%description source
-Source code of %{srcname}.
-
-%description source -l pl.UTF-8
-Kod źródłowy %{srcname}.
-
 %prep
-%setup -q -n %{srcname}-%{version}
-#%%undos build.xml
-# %patch2 -p1 -b .tests-headless
+%setup -q -n %{srcname}-%{version}.%{snap}
 
 # Segfaults for us and for fedora
 rm test/com/sun/jna/DirectTest.java
@@ -92,19 +57,13 @@
 required_jars="jaxp_parser_impl"
 CLASSPATH=$(build-classpath $required_jars)
 export CLASSPATH
-
 export LC_ALL=en_US # source code not US-ASCII
 
 %ant
 
-# %{__make}
 cd src
 %javac -cp $CLASSPATH $(find -name '*.java')
 %jar cf ../%{srcname}.jar $(find -name '*.class')
-%if %{with source}
-%jar cf ../%{srcname}.src.jar $(find -name '*.java')
-%endif
-cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -114,40 +73,22 @@
 cp -a dist/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
 ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
-# for jakarta packages:
-#for a in dist/*.jar; do
-#	jar=${a##*/}
-#	cp -a dist/$jar $RPM_BUILD_ROOT%{_javadir}/${jar%%.jar}-%{version}.jar
-#	ln -s ${jar%%.jar}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$jar
-#done
-
-
-# source
-install -d $RPM_BUILD_ROOT%{_javasrcdir}
-cp -a %{srcname}.src.jar $RPM_BUILD_ROOT%{_javasrcdir}/%{srcname}.src.jar
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(644,root,root,755)
 %{_javadir}/%{srcname}.jar
 %{_javadir}/%{srcname}-%{version}.jar
 
-
-%if %{with source}
-%files source
-%defattr(644,root,root,755)
-%{_javasrcdir}/%{srcname}.src.jar
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/12/29 16:20:22  glen
+- rename to java-jna (why add it to cvs with wrong name in first place?)
+
 Revision 1.1  2010/12/29 15:18:58  matkor
 - Initial. Post 3.2.7 rev 1177.
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jna/java-jna.spec?r1=1.1&r2=1.2&f=u

