[felix-osgi-foundation] Install LICENSE and NOTICE
Stanislav Ochotnicky
sochotni at fedoraproject.org
Fri Aug 17 09:00:57 UTC 2012
commit cd6e615def2e2e46b6a68b95f2792e31624071c1
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu Aug 16 20:06:37 2012 +0200
Install LICENSE and NOTICE
- Fix directory permissions
- Remove rpm bug workaround
felix-osgi-foundation.spec | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/felix-osgi-foundation.spec b/felix-osgi-foundation.spec
index 2adfbc8..7672881 100644
--- a/felix-osgi-foundation.spec
+++ b/felix-osgi-foundation.spec
@@ -7,7 +7,7 @@
Name: felix-osgi-foundation
Version: 1.2.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Felix OSGi Foundation EE Bundle
Group: Development/Libraries
@@ -29,9 +29,6 @@ BuildRequires: maven-surefire-provider-junit4
Requires: java >= 1:1.6.0
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
%description
OSGi Foundation Execution Environment (EE) Classes.
@@ -50,33 +47,37 @@ API documentation for %{name}.
mvn-rpmbuild install javadoc:javadoc
%install
+install -d -m 755 %{buildroot}%{felixdir}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+
# jar
-install -pD -T -m 644 target/%{bundle}-%{version}.jar \
+install -p -m 644 target/%{bundle}-%{version}.jar \
%{buildroot}%{felixdir}/%{bundle}.jar
# pom
-install -pD -T -m 644 pom.xml %{buildroot}%{POM}
+install -p -m 644 pom.xml %{buildroot}%{POM}
%add_maven_depmap JPP.felix-%{bundle}.pom felix/%{bundle}.jar
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
%files
-%doc LICENSE
+%doc LICENSE NOTICE
%{felixdir}
%{POM}
%{_mavendepmapfragdir}/%{name}
%files javadoc
+%doc LICENSE NOTICE
%{_javadocdir}/%{name}
%changelog
+* Thu Aug 16 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.2.0-10
+- Install LICENSE and NOTICE
+- Fix directory permissions
+- Remove rpm bug workaround
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list