Author: paszczus Date: Fri Mar 27 13:17:53 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- changed Name to java-log4j
---- Files affected:
SPECS:
java-log4j.spec (1.46 -> 1.47)
---- Diffs:
================================================================
Index: SPECS/java-log4j.spec
diff -u SPECS/java-log4j.spec:1.46 SPECS/java-log4j.spec:1.47
--- SPECS/java-log4j.spec:1.46 Thu Feb 19 13:31:46 2009
+++ SPECS/java-log4j.spec Fri Mar 27 14:17:46 2009
@@ -1,6 +1,5 @@
# $Revision$, $Date$
# TODO:
-# - rename to apache-log4j?
# - some tests fail, but it seems to be an error in tests, not in log4j
#
# NOTE:
@@ -18,19 +17,21 @@
%define with_jmx 1
%endif
#
+%define srcname log4j
+#
%include /usr/lib/rpm/macros.java
Summary: log4j - logging for Java
Summary(pl.UTF-8): log4j - zapis logów dla Javy
-Name: logging-log4j
+Name: java-%{srcname}
Version: 1.2.15
Release: 4
License: Apache v2.0
-Group: Libraries/Java
-Source0:
http://www.apache.org/dist/logging/log4j/%{version}/apache-log4j-%{version}.tar.gz
+Group: Development/Languages/Java
+Source0:
http://www.apache.org/dist/logging/log4j/%{version}/apache-%{srcname}-%{version}.tar.gz
# Source0-md5: 10f04abe4d68d5a89e8eb167e4e45e1a
URL: http://logging.apache.org/log4j/
Patch0: apache-log4j-javadoc.patch
-Patch1: %{name}-sourcetarget.patch
+Patch1: logging-%{srcname}-sourcetarget.patch
BuildRequires: ant >= 1.7.1-4
%{?with_tests:BuildRequires: ant-junit}
BuildRequires: java-activation
@@ -104,18 +105,18 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
-cp -a dist/lib/log4j-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/log4j-%{version}.jar
-ln -s log4j-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/log4j.jar
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{srcname}-%{version}}
+cp -a dist/lib/%{srcname}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
-cp -a docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+cp -a docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost
symlink
%clean
rm -rf $RPM_BUILD_ROOT
%post javadoc
-ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
%files
%defattr(644,root,root,755)
@@ -129,8 +130,8 @@
%files javadoc
%defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -138,6 +139,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2009/03/27 13:17:46 paszczus
+- changed Name to java-log4j
+
Revision 1.46 2009/02/19 12:31:46 pawelz
- dropped R: jdk
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-log4j.spec?r1=1.46&r2=1.47&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
