From a9e8159a658aa7409d3c3c5eba77a60aa40f444a Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Dec 13 2010 21:46:24 +0000
Subject: Fix pom name.


Adapt to current guidelines.
---

diff --git a/felix-osgi-core.spec b/felix-osgi-core.spec
index 4543527..5c95b7b 100644
--- a/felix-osgi-core.spec
+++ b/felix-osgi-core.spec
@@ -2,7 +2,7 @@
 
 Name:    felix-osgi-core
 Version: 1.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Felix OSGi R4 Core Bundle
 
 Group:   Development/Libraries
@@ -11,7 +11,6 @@ URL:     http://felix.apache.org/site/apache-felix-osgi-core.html
 Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
 Source1: %{name}-%{version}-build.xml.tar.gz
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
@@ -51,23 +50,18 @@ tar xf %{SOURCE1}
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}/felix
 install -m 644 target/%{bundle}-%{version}.jar \
-        %{buildroot}%{_javadir}/felix/%{bundle}-%{version}.jar
-
-(cd %{buildroot}%{_javadir}/felix && for jar in *-%{version}*; \
-    do %__ln_s -f ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+        %{buildroot}%{_javadir}/felix/%{bundle}.jar
 
 %add_to_maven_depmap org.apache.felix %{bundle} %{version} JPP/felix %{bundle}
 
 # poms
 install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
 install -pm 644 pom.xml \
-%{buildroot}%{_datadir}/maven2/poms/JPP.felix-%{name}.pom
+%{buildroot}%{_datadir}/maven2/poms/JPP.felix-%{bundle}.pom
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-%__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-%__rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %post
 %update_maven_depmap
@@ -75,22 +69,22 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
 %postun
 %update_maven_depmap
 
-%clean
-%__rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_javadir}/felix
-%{_datadir}/maven2/poms/JPP.felix-%{name}.pom
+%{_datadir}/maven2/poms/JPP.felix-%{bundle}.pom
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Dec 13 2010 Alexander Kurtakov <akurtako@redhat.com> 1.4.0-3
+- Fix pom name.
+- Adapt to current guidelines.
+
 * Tue Jun 29 2010 Victor G. Vasilyev <victor.vasilyev@sun.com> 1.4.0-2
 - Modify maven-build.xml to include MANIFEST.MF into JAR