From d32c0f83d809769e4a73022fbc39176ac62e66dd Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Dec 07 2010 23:42:18 +0000
Subject: - Adapt to current guidelines.


---

diff --git a/cssparser.spec b/cssparser.spec
index 460c457..8760c7d 100644
--- a/cssparser.spec
+++ b/cssparser.spec
@@ -1,6 +1,6 @@
 Name:           cssparser
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        CSS Parser
 
 Group:          Development/Libraries
@@ -10,7 +10,6 @@ URL:            http://cssparser.sourceforge.net/
 Source0:        cssparser-0.9.5.tar.lzma
 Source1:        fetch-cssparser.sh
 Patch0:         %{name}-javacc.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
@@ -18,12 +17,12 @@ BuildRequires: sac >= 1.3-6
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: junit4
 BuildRequires: javacc-maven-plugin >= 2.6-3
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-source
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-resources-plugin
 BuildRequires: maven-surefire-maven-plugin
 BuildRequires: maven-surefire-provider-junit4
 BuildRequires: maven-doxia-sitetools
@@ -36,11 +35,11 @@ A CSS parser which implements SAC (the Simple API for CSS).
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
+Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
 
-
 %prep
 %setup -q -n %{name}
 
@@ -59,10 +58,7 @@ rm -rf %{buildroot}
 
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
 %add_to_maven_depmap net.sourceforge.cssparser cssparser %{version} JPP cssparser
 
@@ -72,9 +68,8 @@ install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.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}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 rm -rf target/site/api*
 
 %post
@@ -83,9 +78,6 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
@@ -99,6 +91,8 @@ rm -rf target/site/api*
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Dec 8 2010 Alexander Kurtakov <akurtako@redhat.com> 0.9.5-2
+- Adapt to current guidelines.
+
 * Wed Mar 24 2010 Alexander Kurtakov <akurtako@redhat.com> 0.9.5-1
 - Initial package.
-