rpms/apache-commons-logging/devel apache-commons-logging.spec, 1.2, 1.3
Stanislav Ochotnicky
sochotni at fedoraproject.org
Tue May 11 08:52:55 UTC 2010
- Previous message: rpms/zabbix/EL-6 zabbix.spec,1.50,1.51
- Next message: rpms/podofo/EL-6 podofo-0.8.0-version.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 podofo.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sochotni
Update of /cvs/pkgs/rpms/apache-commons-logging/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16444/devel
Modified Files:
apache-commons-logging.spec
Log Message:
Various cleanups in spec file
- Fix up add_to_maven_depmap
- Add jpackage-utils Requires for javadoc
- Cleanup install a bit (to be consistent with other commons)
Index: apache-commons-logging.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apache-commons-logging/devel/apache-commons-logging.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- apache-commons-logging.spec 7 May 2010 09:29:44 -0000 1.2
+++ apache-commons-logging.spec 11 May 2010 08:52:55 -0000 1.3
@@ -1,11 +1,10 @@
%global base_name logging
%global short_name commons-%{base_name}
-%global section free
Name: apache-%{short_name}
Version: 1.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Apache Commons Logging
License: ASL 2.0
Group: Development/Libraries
@@ -42,11 +41,10 @@ Requires(postun):jpackage-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+# This should go away with F-17
Provides: jakarta-commons-logging = 0:%{version}-%{release}
Obsoletes: jakarta-commons-logging <= 0:1.0.4
-
-
%description
The commons-logging package provides a simple, component oriented
interface (org.apache.commons.logging.Log) together with wrappers for
@@ -61,9 +59,11 @@ logging implementation.
%package javadoc
Summary: API documentation for %{name}
Group: Documentation
+Requires: jpackage-utils
+
%description javadoc
-Javadoc for %{name}.
+%{summary}.
# -----------------------------------------------------------------------------
@@ -95,12 +95,18 @@ install -d -m 755 $RPM_BUILD_ROOT%{_java
install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
install -p -m 644 target/%{short_name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar
install -p -m 644 target/%{short_name}-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+pushd $RPM_BUILD_ROOT%{_javadir}
+for jar in *-%{version}*; do
+ ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
+ ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
+done
+popd # come back from javadir
+
+# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
+%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{name}
# javadoc
@@ -132,11 +138,17 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}*
+%{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
# -----------------------------------------------------------------------------
%changelog
+* Mon May 10 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1.1-5
+- Fix up add_to_maven_depmap
+- Add jpackage-utils Requires for javadoc
+- Cleanup install a bit
+
* Fri May 7 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1.1-4
- Fix provides
- Previous message: rpms/zabbix/EL-6 zabbix.spec,1.50,1.51
- Next message: rpms/podofo/EL-6 podofo-0.8.0-version.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 podofo.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list