[plexus-cipher] Fix FTBFS (Resolves: #992802)

[Michal Srb]

commit 91533692729417e53d7df47dc0e9991f98e138f4
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Aug 5 16:50:51 2013 +0200

    Fix FTBFS (Resolves: #992802)
    
    - Adapt to current guidelines

 plexus-cipher.spec |   47 +++++++++++++++++++++--------------------------
 1 files changed, 21 insertions(+), 26 deletions(-)
---
diff --git a/plexus-cipher.spec b/plexus-cipher.spec
index f33735f..16389ae 100644
--- a/plexus-cipher.spec
+++ b/plexus-cipher.spec
@@ -1,9 +1,8 @@
 Name:           plexus-cipher
 Version:        1.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Plexus Cipher: encryption/decryption Component
 
-Group:          Development/Libraries
 License:        ASL 2.0
 # project moved to GitHub and it looks like there is no official website anymore
 URL:            https://github.com/sonatype/plexus-cipher
@@ -33,19 +32,17 @@ BuildRequires: junit
 BuildRequires: maven-shared-reporting-impl
 BuildRequires: plexus-digest
 BuildRequires: sisu-maven-plugin
-BuildRequires: sisu-inject-bean
+# needed instead of sisu-inject-bean
+BuildRequires: atinject
+BuildRequires: cdi-api1
 
-Requires: jpackage-utils
-Requires: java
 
 
 %description
 Plexus Cipher: encryption/decryption Component
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
@@ -57,34 +54,32 @@ API documentation for %{name}.
 # replace %{version}-SNAPSHOT with %{version}
 %pom_xpath_replace pom:project/pom:version "<version>%{version}</version>"
 
-%build
-mvn-rpmbuild -Dmaven.test.failure.ignore=true \
-             install javadoc:aggregate
-
-%install
-# jars
-install -Dm 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/plexus/%{name}.jar
+# fedora moved from sonatype sisu to eclipse sisu. sisu-inject-bean artifact
+# doesn't exist in eclipse sisu. this artifact contains nothing but
+# bundled classes from atinject, cdi-api, aopalliance and maybe others.
+%pom_remove_dep org.sonatype.sisu:sisu-inject-bean
+%pom_add_dep javax.inject:javax.inject:1:provided
+%pom_add_dep javax.enterprise:cdi-api:1.0:provided
 
-# poms
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.plexus-%{name}.pom
+%mvn_file : plexus/%{name}
 
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
+%build
+%mvn_build -f
 
-%add_maven_depmap JPP.plexus-%{name}.pom plexus/%{name}.jar
+%install
+%mvn_install
 
-%files
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt
-%{_javadir}/plexus/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/plexus/%{name}
 
 %changelog
+* Mon Aug 05 2013 Michal Srb <msrb at redhat.com> - 1.7-4
+- Fix FTBFS (Resolves: #992802)
+- Adapt to current guidelines
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild