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


Adapt to current guidelines.
---

diff --git a/felix-osgi-obr.spec b/felix-osgi-obr.spec
index 68e7e54..8c660cd 100644
--- a/felix-osgi-obr.spec
+++ b/felix-osgi-obr.spec
@@ -2,7 +2,7 @@
 
 Name:           felix-osgi-obr
 Version:        1.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Felix OSGi OBR Service API
 
 Group:          Development/Libraries
@@ -10,7 +10,6 @@ License:        ASL 2.0
 URL:            http://felix.apache.org/site/apache-felix-osgi-bundle-repository.html
 Source0:        http://www.apache.org/dist/felix/org.osgi.service.obr-%{version}-project.tar.gz
 Source1:        build.xml.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils
 BuildRequires:  felix-osgi-core
@@ -49,23 +48,18 @@ rm -rf %{buildroot}
 # 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 -sf ${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
@@ -73,22 +67,22 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE NOTICE
 %{_javadir}/felix/*.jar
-%{_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.0.2-3
+- Fix pom name.
+- Adapt to current guidelines.
+
 * Thu Sep 3 2009 Alexander Kurtakov <akurtako@redhat.com> 1.0.2-2
 - Fix line length.