- update

Changed files:
    java.spec -> 1.53

diff --git a/java.spec b/java.spec
index fbbe7c67d22f96e87b52d74ec3014533ee5152dd..c2b17571e0ff34e8cd19b51620c9593ef6378072 100644 (file)
--- a/java.spec
+++ b/java.spec
@@ -6,8 +6,6 @@
 %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
@@ -17,9 +15,10 @@
 # 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:       -
@@ -146,16 +145,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
 
@@ -182,8 +181,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)