[Jpackage-commits] dist/myfaces-core11-impl/JPP-6 apache-myfaces-component-info.xml, NONE, 1.1 myfaces-core11-impl.spec, 1.3, 1.4

David Walluck david at ryu.zarb.org
Thu Jul 9 00:19:27 CEST 2009


Update of /home/projects/jpackage/cvs/dist/myfaces-core11-impl/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv9560

Modified Files:
	myfaces-core11-impl.spec 
Added Files:
	apache-myfaces-component-info.xml 
Log Message:
- add repolib
- fix LICENSE.txt eol


--- NEW FILE: apache-myfaces-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="apache-myfaces"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="myfaces-impl-1.1.3.jar"/>
    <artifact id="myfaces-api-1.1.3.jar"/>


    <export>
      <include input="myfaces-impl-1.1.3.jar"/>
      <include input="myfaces-api-1.1.3.jar"/>

    </export>
  </component>
</project>

Index: myfaces-core11-impl.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/myfaces-core11-impl/JPP-6/myfaces-core11-impl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** myfaces-core11-impl.spec	21 May 2009 09:52:40 -0000	1.3
--- myfaces-core11-impl.spec	8 Jul 2009 22:19:25 -0000	1.4
***************
*** 29,32 ****
--- 29,43 ----
  #
  
+ %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+ %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+ %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+ %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+ 
+ %bcond_without repolib
+ 
+ %define repodir %{_javadir}/repository.jboss.com/apache-myfaces/%{version}-brew
+ %define repodirlib %{repodir}/lib
+ %define repodirsrc %{repodir}/src
+ 
  %define section free
  %define parent myfaces
***************
*** 35,50 ****
  Name:           myfaces-core11-impl
  Version:        1.1.5
! Release:        2%{?dist}
  Epoch:          0
! License:        Apache Software License 2.0
  URL:            http://myfaces.apache.org/
  Group:          Development/Libraries/Application Frameworks
  Source0:        myfaces-core-1.1.5.tar.gz
- # svn export http://svn.apache.org/repos/asf/myfaces/core/tags/1_1_5/ myfaces-core-1.1.5
- 
  Source1:        myfaces-core11-impl-jpp-depmap.xml
  Source2:        myfaces-core11-impl-settings.xml
  Source3:        myfaces-master.pom
! 
  Patch0:         myfaces-core11-impl-parent-pom.patch
  Patch1:         myfaces-core11-impl-pom.patch
--- 46,60 ----
  Name:           myfaces-core11-impl
  Version:        1.1.5
! Release:        3%{?dist}
  Epoch:          0
! License:        ASL 2.0
  URL:            http://myfaces.apache.org/
  Group:          Development/Libraries/Application Frameworks
+ # svn -q export http://svn.apache.org/repos/asf/myfaces/core/tags/1_1_5/ myfaces-core-1.1.5
  Source0:        myfaces-core-1.1.5.tar.gz
  Source1:        myfaces-core11-impl-jpp-depmap.xml
  Source2:        myfaces-core11-impl-settings.xml
  Source3:        myfaces-master.pom
! Source4:        apache-myfaces-component-info.xml
  Patch0:         myfaces-core11-impl-parent-pom.patch
  Patch1:         myfaces-core11-impl-pom.patch
***************
*** 52,56 ****
  Patch3:         myfaces-core11-impl-PropertyResolverTestCase.patch
  Patch4:         myfaces-core11-impl-FacesConfigValidatorTestCase.patch
- 
  BuildRequires:  jpackage-utils >= 0:1.7.3
  BuildRequires:  java-devel >= 0:1.5.0
--- 62,65 ----
***************
*** 65,69 ****
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-source
! BuildRequires:  maven-surefire-plugin
  BuildRequires:  mojo-maven2-plugin-build-helper
  BuildRequires:  mojo-maven2-plugin-xslt
--- 74,78 ----
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-source
! BuildRequires:  maven-surefire-maven-plugin
  BuildRequires:  mojo-maven2-plugin-build-helper
  BuildRequires:  mojo-maven2-plugin-xslt
***************
*** 126,129 ****
--- 135,149 ----
  %{summary}.
  
+ %if %with repolib
+ %package repolib
+ Summary:        Artifacts to be uploaded to a repository library
+ Group:          Development/Libraries/Java
+ 
+ %description repolib
+ Artifacts to be uploaded to a repository library.
+ This package is not meant to be installed but so its contents
+ can be extracted through rpm2cpio.
+ %endif
+ 
  %prep
  %setup -q -n myfaces-core-%{version}
***************
*** 135,140 ****
  %patch4 -b .sav4
  
! %build
! cp %{SOURCE2} maven2-settings.xml
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
--- 155,161 ----
  %patch4 -b .sav4
  
! %{__perl} -pi -e 's/\r$//g' assembly/src/main/resources/LICENSE.txt
! 
! cp -p %{SOURCE2} maven2-settings.xml
  
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
***************
*** 147,157 ****
  ln -s %{_javadir} external_repo/JPP
  
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
  mkdir -p ${MAVEN_REPO_LOCAL}/JPP/maven2/default_poms/
! cp %{SOURCE3} ${MAVEN_REPO_LOCAL}/JPP/maven2/default_poms/org.apache.myfaces-myfaces.pom
! 
  
! mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.test.failure.ignore=true \
--- 168,178 ----
  ln -s %{_javadir} external_repo/JPP
  
+ %build
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
  mkdir -p ${MAVEN_REPO_LOCAL}/JPP/maven2/default_poms/
! cp -p %{SOURCE3} ${MAVEN_REPO_LOCAL}/JPP/maven2/default_poms/org.apache.myfaces-myfaces.pom
  
! %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.test.failure.ignore=true \
***************
*** 160,164 ****
          install javadoc:javadoc
  
- 
  %install
  rm -rf $RPM_BUILD_ROOT
--- 181,184 ----
***************
*** 168,174 ****
  mkdir tmpd
  pushd tmpd
! jar xf $(build-classpath myfaces/core11-api)
! jar xf ../impl/target/myfaces-impl-%{version}.jar
! jar cf ../myfaces-all-%{version}.jar *
  popd
  rm -rf tmpd
--- 188,194 ----
  mkdir tmpd
  pushd tmpd
! %{jar} xf $(build-classpath myfaces/core11-api)
! %{jar} xf ../impl/target/myfaces-impl-%{version}.jar
! %{jar} cf ../myfaces-all-%{version}.jar *
  popd
  rm -rf tmpd
***************
*** 189,192 ****
--- 209,233 ----
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
+ %if %with repolib
+ install -d -m 755 $RPM_BUILD_ROOT%{repodir}
+ install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
+ install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{repodir}/component-info.xml
+ sed -i 's/@VERSION@/%{version}-brew/g' $RPM_BUILD_ROOT%{repodir}/component-info.xml
+ tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
+ sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
+ install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
+ install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
+ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{repodirsrc}
+ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{repodirsrc}
+ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{repodirsrc}
+ install -p -m 644 %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc}
+ install -p -m 644 %{PATCH1} $RPM_BUILD_ROOT%{repodirsrc}
+ install -p -m 644 %{PATCH2} $RPM_BUILD_ROOT%{repodirsrc}
+ install -p -m 644 %{PATCH3} $RPM_BUILD_ROOT%{repodirsrc}
+ install -p -m 644 %{PATCH4} $RPM_BUILD_ROOT%{repodirsrc}
+ cp -p $RPM_BUILD_ROOT%{_javadir}/%{parent}/core11-impl.jar $RPM_BUILD_ROOT%{repodirlib}/myfaces-impl-1.1.3.jar
+ cp -p %{_javadir}/%{parent}/core11-api.jar $RPM_BUILD_ROOT%{repodirlib}/myfaces-api-1.1.3.jar
+ %endif
+ 
  %clean
  rm -rf $RPM_BUILD_ROOT
***************
*** 201,207 ****
  %defattr(0644,root,root,0755)
  %doc assembly/src/main/resources/LICENSE.txt
! %{_javadir}/%{parent}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
--- 242,254 ----
  %defattr(0644,root,root,0755)
  %doc assembly/src/main/resources/LICENSE.txt
! %dir %{_javadir}/%{parent}
! %{_javadir}/%{parent}/core11-impl-%{version}.jar
! %{_javadir}/%{parent}/core11-impl.jar
! %{_javadir}/%{parent}/myfaces-all-%{version}.jar
! %{_javadir}/%{parent}/myfaces-all.jar
! %{_javadir}/%{parent}/myfaces-impl.jar
! %{_javadir}/%{parent}/myfaces-jsf-api.jar
! %{_datadir}/maven2/poms/JPP.%{parent}-core11-impl.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
***************
*** 210,214 ****
--- 257,271 ----
  %{_javadocdir}/%{name}
  
+ %if %with repolib
+ %files repolib
+ %defattr(0644,root,root,0755)
+ %{_javadir}/repository.jboss.com
+ %endif
+ 
  %changelog
+ * Wed Jul 08 2009 David Walluck <dwalluck at redhat.com> 0:1.1.5-3
+ - add repolib
+ - fix LICENSE.txt eol 
+ 
  * Thu May 21 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.1.5-2.jpp5
  - Fix to myfaces-shared11
***************
*** 217,219 ****
  - 1.1.5 as myfaces-core11-impl
  - Provide and Obsolete myfaces
- 
--- 274,275 ----




More information about the JPackage-commits mailing list