[Jpackage-commits] rpms/free/mina11 mina11.spec,1.1,1.1.2.1

jpackage jpackage at ryu.zarb.org
Sun Feb 8 20:08:18 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/mina11
In directory ryu.zarb.org:/tmp/W0GUExwKbQ/rpms/free/mina11

Modified Files:
      Tag: JPACKAGE-5_0
	mina11.spec 
Log Message:
1.1.4-2.jpp5

Index: mina11.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/mina11/mina11.spec,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** mina11.spec	5 Jul 2008 12:38:32 -0000	1.1
--- mina11.spec	8 Feb 2009 19:08:15 -0000	1.1.2.1
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 39,43 ****
  Name:           mina11
  Version:        1.1.4
! Release:        1%{dist}
  Epoch:		0
  Group:          System/Networking
--- 39,43 ----
  Name:           mina11
  Version:        1.1.4
! Release:        2%{dist}
  Epoch:		0
  Group:          System/Networking
***************
*** 51,58 ****
  Source3:        %{name}-settings.xml
  
- #Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- #Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:	java-devel = 0:1.5.0
  BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-default-skin
--- 51,56 ----
  Source3:        %{name}-settings.xml
  
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:	java-devel >= 0:1.5.0
  BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-default-skin
***************
*** 151,163 ****
  %{summary}.
  
- #%package java5
- #Group:          System/Networking
- #Summary:        Java5 extensions for %{name}
- #Requires:	%{name} = %{epoch}:%{version}-%{release}
- #Requires:	slf4j
- #
- #%description java5
- #%{summary}.
- 
  %package demo
  Group:          System/Networking
--- 149,152 ----
***************
*** 175,180 ****
  Group:          Development/Documentation
  Summary:        Javadoc for %{name}
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
--- 164,167 ----
***************
*** 208,214 ****
  ln -s %{_javadir} external_repo/JPP
  
- export JAVA_HOME=%{_jvmdir}/java-1.5.0
- 
- 
  export M2SETTINGS=$(pwd)/maven2-settings.xml
  export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
--- 195,198 ----
***************
*** 241,279 ****
  install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina-build.pom
! %add_to_maven_depmap org.apache.mina build %{version} JPP/mina build
  
  install -m 644 core/target/%{oname}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/core-%{version}.jar
! install -m 644 core/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina-core.pom
! %add_to_maven_depmap org.apache.mina mina-core %{version} JPP/mina core
  
  install -m 644 filter-codec-netty/target/%{oname}-filter-codec-netty-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/filter-codec-netty-%{version}.jar
! install -m 644 filter-codec-netty/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina-filter-codec-netty.pom
! %add_to_maven_depmap org.apache.mina mina-filter-codec-netty %{version} JPP/mina filter-codec-netty
  
  install -m 644 filter-compression/target/%{oname}-filter-compression-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/filter-compression-%{version}.jar
! install -m 644 filter-compression/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina-filter-compression.pom
! %add_to_maven_depmap org.apache.mina mina-filter-compression %{version} JPP/mina filter-compression
  
  install -m 644 example/target/%{oname}-example-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/example-%{version}.jar
! install -m 644 example/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina-example.pom
! %add_to_maven_depmap org.apache.mina mina-example %{version} JPP/mina example
  
  install -m 644 filter-ssl/target/%{oname}-filter-ssl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/filter-ssl-%{version}.jar
! install -m 644 filter-ssl/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina-filter-ssl.pom
! %add_to_maven_depmap org.apache.mina mina-filter-ssl %{version} JPP/mina filter-ssl
  
  install -m 644 integration-jmx/target/%{oname}-integration-jmx-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/integration-jmx-%{version}.jar
! install -m 644 integration-jmx/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina-integration-jmx.pom
! %add_to_maven_depmap org.apache.mina mina-integration-jmx %{version} JPP/mina integration-jmx
  
  install -m 644 integration-spring/target/%{oname}-integration-spring-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/integration-spring-%{version}.jar
! install -m 644 integration-spring/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina-integration-spring.pom
! %add_to_maven_depmap org.apache.mina mina-integration-spring %{version} JPP/mina integration-spring
! 
! #install -m 644 java5/target/%{name}-java5-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/java5-%{version}.jar
! #install -m 644 java5/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina-java5.pom
! #%add_to_maven_depmap org.apache.mina mina-java5 %{version} JPP/mina java5
! 
  
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
--- 225,258 ----
  install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
  
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina11-build.pom
! %add_to_maven_depmap org.apache.mina build %{version} JPP/mina11 build
  
  install -m 644 core/target/%{oname}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/core-%{version}.jar
! install -m 644 core/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina11-core.pom
! %add_to_maven_depmap org.apache.mina mina-core %{version} JPP/mina11 core
  
  install -m 644 filter-codec-netty/target/%{oname}-filter-codec-netty-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/filter-codec-netty-%{version}.jar
! install -m 644 filter-codec-netty/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina11-filter-codec-netty.pom
! %add_to_maven_depmap org.apache.mina mina-filter-codec-netty %{version} JPP/mina11 filter-codec-netty
  
  install -m 644 filter-compression/target/%{oname}-filter-compression-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/filter-compression-%{version}.jar
! install -m 644 filter-compression/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina11-filter-compression.pom
! %add_to_maven_depmap org.apache.mina mina-filter-compression %{version} JPP/mina11 filter-compression
  
  install -m 644 example/target/%{oname}-example-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/example-%{version}.jar
! install -m 644 example/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina11-example.pom
! %add_to_maven_depmap org.apache.mina mina-example %{version} JPP/mina11 example
  
  install -m 644 filter-ssl/target/%{oname}-filter-ssl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/filter-ssl-%{version}.jar
! install -m 644 filter-ssl/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina11-filter-ssl.pom
! %add_to_maven_depmap org.apache.mina mina-filter-ssl %{version} JPP/mina11 filter-ssl
  
  install -m 644 integration-jmx/target/%{oname}-integration-jmx-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/integration-jmx-%{version}.jar
! install -m 644 integration-jmx/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina11-integration-jmx.pom
! %add_to_maven_depmap org.apache.mina mina-integration-jmx %{version} JPP/mina11 integration-jmx
  
  install -m 644 integration-spring/target/%{oname}-integration-spring-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/integration-spring-%{version}.jar
! install -m 644 integration-spring/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.mina11-integration-spring.pom
! %add_to_maven_depmap org.apache.mina mina-integration-spring %{version} JPP/mina11 integration-spring
  
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
***************
*** 302,314 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-     rm -f %{_javadocdir}/%{name}
- fi
- 
  %post
  %update_maven_depmap
--- 281,284 ----
***************
*** 366,371 ****
  %{_javadir}/%{name}/core*.jar
  %{_javadir}/%{name}-jdk14*.jar
! %{_datadir}/maven2/poms
! %{_mavendepmapfragdir}
  %if %{gcj_support}
  %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
--- 336,341 ----
  %{_javadir}/%{name}/core*.jar
  %{_javadir}/%{name}-jdk14*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
***************
*** 387,391 ****
  %endif
  
- 
  %files filter-ssl
  %defattr(0644,root,root,0755)
--- 357,360 ----
***************
*** 400,407 ****
  %{_javadir}/%{name}/integration-spring*.jar
  
- #%files java5
- #%defattr(0644,root,root,0755)
- #%{_javadir}/%{name}/java5*.jar
- 
  %files demo
  %defattr(0644,root,root,0755)
--- 369,372 ----
***************
*** 410,415 ****
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %ghost %{_javadocdir}/%{name}
  
  %files manual
--- 375,380 ----
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %files manual
***************
*** 418,421 ****
--- 383,389 ----
  
  %changelog
+ * Mon Feb 09 2009 Ralph Apel <r.apel at r-apel.de> 0:1.1.4-2.jpp5
+ - Fix pom naming and depmaps
+ 
  * Fri Jul 04 2008 Ralph Apel <r.apel at r-apel.de> 0:1.1.4-1.jpp5
  - 1.1.4




More information about the JPackage-commits mailing list