[Jpackage-commits] dist/maven-archiver/JPP-6 maven-archiver.spec, 1.7, 1.8

David Walluck david at ryu.zarb.org
Wed Oct 12 22:28:24 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-archiver/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv29831

Modified Files:
	maven-archiver.spec 
Log Message:
- add maven scriptlets
- fix install


Index: maven-archiver.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-archiver/JPP-6/maven-archiver.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** maven-archiver.spec	12 Oct 2011 18:23:05 -0000	1.7
--- maven-archiver.spec	12 Oct 2011 20:28:22 -0000	1.8
***************
*** 28,34 ****
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  Name:           maven-archiver
  Version:        2.4.2
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Maven Archiver
--- 28,36 ----
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
+ %globale namedversion %{version}
+ 
  Name:           maven-archiver
  Version:        2.4.2
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Maven Archiver
***************
*** 89,111 ****
  # jar
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! %{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
  
  # pom
  %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
  %{__cp} -p pom.xml %{buildroot}/%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap org.apache.maven maven-archiver %{version} JPP %{name}
  
  # javadoc
! %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__cp} -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  %clean
  %{__rm} -rf %{buildroot}
  
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}*/%{name}-%{version}.jar
  %{_javadir}*/%{name}.jar
  %{_datadir}/maven2/poms/JPP-%{name}.pom
--- 91,119 ----
  # jar
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p target/maven-archiver-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}-%{namedversion}.jar
! %{__ln_s} %{name}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}.jar
  
  # pom
  %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
  %{__cp} -p pom.xml %{buildroot}/%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap org.apache.maven maven-archiver %{namedversion} JPP %{name}
  
  # javadoc
! %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! %{__cp} -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! %{__ln_s} %{name}-%{namedversion} %{buildroot}%{_javadocdir}/%{name}
  
  %clean
  %{__rm} -rf %{buildroot}
  
+ %post
+ %update_maven_depmap
+ 
+ %postun
+ %update_maven_depmap
+ 
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}*/%{name}-%{namedversion}.jar
  %{_javadir}*/%{name}.jar
  %{_datadir}/maven2/poms/JPP-%{name}.pom
***************
*** 114,121 ****
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
  
  %changelog
  * Wed Oct 12 2011 David Walluck <dwalluck at redhat.com> 0:2.4.2-1
  - 2.4.2
--- 122,133 ----
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{namedversion}
  %{_javadocdir}/%{name}
  
  %changelog
+ * Wed Oct 12 2011 David Walluck <dwalluck at redhat.com> 0:2.4.2-2
+ - add maven scriptlets
+ - fix install
+ 
  * Wed Oct 12 2011 David Walluck <dwalluck at redhat.com> 0:2.4.2-1
  - 2.4.2




More information about the JPackage-commits mailing list