X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=java.spec;h=0ea9d7bd7669f608104cf98d97fb1bd3d0e8cb7a;hb=2f89de89a978d1a8bb6d369047a579ebda5e7854;hp=96f3a0251360a100d236acc66c835d92b336dc1a;hpb=4e45fb88a91cfbb404ac6c4bfda860b4aedf725a;p=projects%2Ftemplate-specs.git

diff --git a/java.spec b/java.spec
index 96f3a02..0ea9d7b 100644
--- a/java.spec
+++ b/java.spec
@@ -1,22 +1,24 @@
 #
+# THIS IS TEMPLATE PACKAGE, CLEANUP UNUSED FRAGMENTS BEFORE SUBMITTING TO CVS
+#
 # 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		-
+%include	/usr/lib/rpm/macros.java
 Summary:	-
 Summary(pl.UTF-8):	-
-Name:		-
+Name:		java-%{srcname}
 Version:	-
 Release:	0.1
 License:	-
@@ -27,11 +29,10 @@ Group:		Libraries/Java
 Source0:	-
 # Source0-md5:	-
 URL:		-
+# this is needed for the LC_ALL=en_US in build part dependency
 %if %(locale -a | grep -q '^en_US$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
-# allows building with alternate JDK
-%buildrequires_jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -56,6 +57,10 @@ Summary(fr.UTF-8):	Documentation pour %{srcname}
 Summary(it.UTF-8):	Documentazione di %{srcname}
 Summary(pl.UTF-8):	Podręcznik dla %{srcname}
 Group:		Documentation
+# noarch subpackages only when building with rpm5
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description doc
 Documentation for %{srcname}.
@@ -104,16 +109,16 @@ Group:		Documentation
 Manual for %{srcname}.
 
 %package source
-Summary:	Source of %{srcname}
-Summary(pl.UTF-8):	Źródła %{srcname}
+Summary:	Source code of %{srcname}
+Summary(pl.UTF-8):	Kod źródłowy %{srcname}
 Group:		Documentation
-Requires:	jpackage-utils >= 1.555
+Requires:	jpackage-utils >= 1.7.5-2
 
 %description source
-Source of %{srcname}.
+Source code of %{srcname}.
 
 %description source -l pl.UTF-8
-Źródła %{srcname}.
+Kod źródłowy %{srcname}.
 
 %prep
 %setup -q -n %{srcname}-%{version}
@@ -126,12 +131,14 @@ required_jars="jaxp_parser_impl"
 CLASSPATH=$(build-classpath $required_jars)
 export CLASSPATH
 
-export LC_ALL=en_US # source code not US-ASCII
+# source code not US-ASCII
+export LC_ALL=en_US
 
 %ant
 
 %{__make}
 
+# if you need to assemble .jar yourself
 cd src
 %javac -cp $CLASSPATH $(find -name '*.java')
 %jar cf ../%{srcname}.jar $(find -name '*.class')
@@ -142,16 +149,16 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javadir}
 
 # jars
-cp -a dist/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+install -d $RPM_BUILD_ROOT%{_javadir}
+cp -p 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
+	cp -p dist/$jar $RPM_BUILD_ROOT%{_javadir}/${jar%%.jar}-%{version}.jar
 	ln -s ${jar%%.jar}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$jar
 done
 
@@ -178,8 +185,8 @@ ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
-%{_javadir}/%{srcname}.jar
 %{_javadir}/%{srcname}-%{version}.jar
+%{_javadir}/%{srcname}.jar
 
 %files doc
 %defattr(644,root,root,755)