Author: glen Date: Wed Jan 25 21:28:49 2012 GMT
Module: template-specs Tag: HEAD
---- Log message:
- update
---- Files affected:
template-specs:
java.spec (1.52 -> 1.53)
---- Diffs:
================================================================
Index: template-specs/java.spec
diff -u template-specs/java.spec:1.52 template-specs/java.spec:1.53
--- template-specs/java.spec:1.52 Sun Sep 18 19:14:49 2011
+++ template-specs/java.spec Wed Jan 25 22:28:44 2012
@@ -7,8 +7,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
@@ -18,9 +16,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: -
@@ -147,16 +146,16 @@
%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
@@ -183,8 +182,8 @@
%files
%defattr(644,root,root,755)
-%{_javadir}/%{srcname}.jar
%{_javadir}/%{srcname}-%{version}.jar
+%{_javadir}/%{srcname}.jar
%files doc
%defattr(644,root,root,755)
@@ -215,6 +214,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.53 2012/01/25 21:28:44 glen
+- update
+
Revision 1.52 2011/09/18 17:14:49 glen
- cosmetic
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/template-specs/java.spec?r1=1.52&r2=1.53&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
