[Jpackage-commits] dist/atinject/devel atinject.spec,1.1,1.2

David Walluck david at ryu.zarb.org
Thu Dec 23 19:58:11 CET 2010


Update of /home/projects/jpackage/cvs/dist/atinject/devel
In directory ryu.zarb.org:/tmp/cvs-serv18255

Modified Files:
	atinject.spec 
Log Message:
- adapt to JPackage

Index: atinject.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/atinject/devel/atinject.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** atinject.spec	23 Dec 2010 18:36:12 -0000	1.1
--- atinject.spec	23 Dec 2010 18:58:09 -0000	1.2
***************
*** 3,7 ****
  Name:           atinject
  Version:        1
! Release:        1.20100611svn86%{?dist}
  Summary:        Dependency injection specification for Java (JSR-330)
  
--- 3,8 ----
  Name:           atinject
  Version:        1
! Release:        2.20100611svn86%{?dist}
! Epoch:          0
  Summary:        Dependency injection specification for Java (JSR-330)
  
***************
*** 15,30 ****
  # tar caf atinject-1.tar.xz atinject-1
  Source0:        %{name}-%{version}.tar.xz
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildArch:      noarch
  
  BuildRequires:       maven2
! BuildRequires:       maven-install-plugin
! BuildRequires:       maven-jar-plugin
  BuildRequires:       maven-surefire-provider-junit4
! BuildRequires:       maven-surefire-plugin
! BuildRequires:       maven-javadoc-plugin
! BuildRequires:       maven-resources-plugin
! BuildRequires:       maven-release-plugin
! BuildRequires:       maven-compiler-plugin
  
  
--- 16,31 ----
  # tar caf atinject-1.tar.xz atinject-1
  Source0:        %{name}-%{version}.tar.xz
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  BuildArch:      noarch
  
  BuildRequires:       maven2
! BuildRequires:       maven2-plugin-install
! BuildRequires:       maven2-plugin-jar
  BuildRequires:       maven-surefire-provider-junit4
! BuildRequires:       maven2-plugin-surefire
! BuildRequires:       maven2-plugin-javadoc
! BuildRequires:       maven2-plugin-resources
! BuildRequires:       maven2-plugin-release
! BuildRequires:       maven2-plugin-compiler
  
  
***************
*** 65,76 ****
  
  install -d -m 755 %{buildroot}%{_javadir}
! install -d -m 755 %{buildroot}%{_mavenpomdir}
  
  %add_to_maven_depmap %{artifactId} %{artifactId} %{version} JPP %{name}
  
  # poms
! install -d -m 755 %{buildroot}%{_mavenpomdir}
  install -pm 644 pom.xml \
!     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
  
  # jar files
--- 66,77 ----
  
  install -d -m 755 %{buildroot}%{_javadir}
! install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
  
  %add_to_maven_depmap %{artifactId} %{artifactId} %{version} JPP %{name}
  
  # poms
! install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
  install -pm 644 pom.xml \
!     %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  # jar files
***************
*** 84,88 ****
  install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
  cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
  
  
--- 85,89 ----
  install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
  cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  
***************
*** 99,112 ****
  %files
  %defattr(-,root,root,-)
! %{_mavenpomdir}/*
  %{_mavendepmapfragdir}/*
! %{_javadir}/*.jar
  
  %files javadoc
  %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}*
  
  %changelog
  * Tue Sep 21 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1-1.20100611svn86
  - Initial version of the package
- 
--- 100,115 ----
  %files
  %defattr(-,root,root,-)
! %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*
! %{_javadir}*/*.jar
  
  %files javadoc
  %defattr(-,root,root,-)
! %{_javadocdir}/%{name}*
  
  %changelog
+ * Thu Dec 29 2010 David Walluck <dwalluck at redhat.com> 0:1-2.20100611svn86
+ - adapt to JPackage
+ 
  * Tue Sep 21 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1-1.20100611svn86
  - Initial version of the package




More information about the JPackage-commits mailing list