Update to upstream version 1.1

.gitignore

@@ -1 +1,2 @@
 /maven-filtering-1.0-source-release.zip
+/maven-filtering-1.1-source-release.zip

maven-filtering.spec

@@ -1,28 +1,16 @@
 Name:             maven-filtering
-Version:          1.0
-Release:          11%{?dist}
+Version:          1.1
+Release:          1%{?dist}
 Summary:          Shared component providing resource filtering
-Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://maven.apache.org/shared/%{name}/index.html
-
 Source0:          http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
-# POM requires plexus-maven-plugin, which was replaced by 
-# plexus-containers-component-metadata
-Patch0:           %{name}-plexus.patch
-  
 BuildArch:        noarch
 
-BuildRequires:    java-devel >= 1:1.6.0
-BuildRequires:    jpackage-utils
 BuildRequires:    maven-local
+BuildRequires:    maven-shared
 BuildRequires:    plexus-build-api
 BuildRequires:    plexus-containers-component-metadata
-BuildRequires:    sisu
-
-Requires:         java >= 1:1.6.0
-Requires:         jpackage-utils
-Requires:         maven
 
 Provides:         maven-shared-filtering = 1.0-99
 Obsoletes:        maven-shared-filtering < 1.0-99 
@@ -33,48 +21,35 @@ Maven Resources Plugin. The goal is to provide a shared component for all
 plugins that needs to filter resources.
 
 %package javadoc
-Group:            Documentation
 Summary:          Javadoc for %{name}
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
+%setup -q
 
+# Replace plexus-maven-plugin with plexus-component-metadata
+%pom_xpath_set "pom:plugin[pom:artifactId[text()='plexus-maven-plugin']]//pom:goal[text()='descriptor']" generate-metadata
+%pom_xpath_set "pom:artifactId[text()='plexus-maven-plugin']" plexus-component-metadata
 
 %build
 # Tests use a package that is no longer present in plexus-build-api (v0.0.7)
-mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip
+%mvn_build -f
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
 
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-
-
-%files
+%files -f .mfiles
 %doc DEPENDENCIES LICENSE NOTICE
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}
 
 %changelog
+* Tue Feb 19 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-1
+- Update to upstream version 1.1
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

sources

@@ -1 +1 @@
-0fb6fb5d407bd7c8d752762859fe530c  maven-filtering-1.0-source-release.zip
+cb43c93dab0a12c8c96b92fb6bf643fc  maven-filtering-1.1-source-release.zip