[Jpackage-commits] dist/logback/devel logback.spec,1.10,1.11

David Walluck david at ryu.zarb.org
Thu Jul 2 20:33:07 CEST 2009


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

Modified Files:
	logback.spec 
Log Message:
- spec cleanup

Index: logback.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/logback/devel/logback.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** logback.spec	12 Jun 2009 17:53:29 -0000	1.10
--- logback.spec	2 Jul 2009 18:33:04 -0000	1.11
***************
*** 33,45 ****
  Name:           logback
  Version:        0.9.14
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Logback
! License:        LGPL
  Group:          Development/Java
  URL:            http://logback.qos.ch
  Source0:        logback-0.9.14.tar.gz
- # svn export http://svn.qos.ch/repos/logback/tags/release_0.9.14 logback-0.9.14
- 
  Source1:        logback-jpp-depmap.xml
  Source2:        logback-settings.xml
--- 33,44 ----
  Name:           logback
  Version:        0.9.14
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Logback
! License:        LGPLv2+
  Group:          Development/Java
  URL:            http://logback.qos.ch
+ # svn -q export http://svn.qos.ch/repos/logback/tags/release_0.9.14 logback-0.9.14
  Source0:        logback-0.9.14.tar.gz
  Source1:        logback-jpp-depmap.xml
  Source2:        logback-settings.xml
***************
*** 49,53 ****
  Patch3:         logback-classic-pom.patch
  Patch4:         logback-access-RequestLogImpl.patch
- 
  BuildArch:      noarch
  Requires(post): jpackage-utils >= 0:1.7.3
--- 48,51 ----
***************
*** 114,119 ****
  %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
--- 112,116 ----
  %patch4 -b .sav4
  
! 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
***************
*** 126,134 ****
  ln -s %{_javadir} external_repo/JPP
  
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
  
  pushd logback-core
! mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
--- 123,132 ----
  ln -s %{_javadir} external_repo/JPP
  
+ %build
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
  
  pushd logback-core
! %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
***************
*** 136,140 ****
          install
  popd
! mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.test.failure.ignore=true \
--- 134,138 ----
          install
  popd
! %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Dmaven.test.failure.ignore=true \
***************
*** 143,147 ****
          install
  
! mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Daggregate=true \
--- 141,145 ----
          install
  
! %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
          -Daggregate=true \
***************
*** 154,167 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -m 644 %{name}-core/target/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/core-%{version}.jar
! install -m 644 %{name}-core/target/%{name}-core-%{version}-tests.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/core-tests-%{version}.jar
  %add_to_maven_depmap ch.qos.logback %{name}-core %{version} JPP/%{name} core
! install -m 644 %{name}-classic/target/%{name}-classic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/classic-%{version}.jar
! install -m 644 %{name}-classic/target/%{name}-classic-%{version}-tests.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/classic-tests-%{version}.jar
  %add_to_maven_depmap ch.qos.logback %{name}-classic %{version} JPP/%{name} classic
! install -m 644 %{name}-access/target/%{name}-access-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/access-%{version}.jar
! install -m 644 %{name}-access/target/%{name}-access-%{version}-tests.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/access-tests-%{version}.jar
  %add_to_maven_depmap ch.qos.logback %{name}-access %{version} JPP/%{name} access
! install -m 644 %{name}-examples/target/%{name}-examples-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/examples-%{version}.jar
  %add_to_maven_depmap ch.qos.logback %{name}-examples %{version} JPP/%{name} examples
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
--- 152,165 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -p -m 644 %{name}-core/target/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/core-%{version}.jar
! install -p -m 644 %{name}-core/target/%{name}-core-%{version}-tests.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/core-tests-%{version}.jar
  %add_to_maven_depmap ch.qos.logback %{name}-core %{version} JPP/%{name} core
! install -p -m 644 %{name}-classic/target/%{name}-classic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/classic-%{version}.jar
! install -p -m 644 %{name}-classic/target/%{name}-classic-%{version}-tests.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/classic-tests-%{version}.jar
  %add_to_maven_depmap ch.qos.logback %{name}-classic %{version} JPP/%{name} classic
! install -p -m 644 %{name}-access/target/%{name}-access-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/access-%{version}.jar
! install -p -m 644 %{name}-access/target/%{name}-access-%{version}-tests.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/access-tests-%{version}.jar
  %add_to_maven_depmap ch.qos.logback %{name}-access %{version} JPP/%{name} access
! install -p -m 644 %{name}-examples/target/%{name}-examples-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/examples-%{version}.jar
  %add_to_maven_depmap ch.qos.logback %{name}-examples %{version} JPP/%{name} examples
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
***************
*** 169,178 ****
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
  %add_to_maven_depmap ch.qos.logback %{name}-parent %{version} JPP/%{name} parent
! install -m 644 %{name}-core/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-core.pom
! install -m 644 %{name}-classic/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-classic.pom
! install -m 644 %{name}-access/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-access.pom
! install -m 644 %{name}-examples/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-examples.pom
  
  # javadoc
--- 167,176 ----
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
  %add_to_maven_depmap ch.qos.logback %{name}-parent %{version} JPP/%{name} parent
! install -p -m 644 %{name}-core/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-core.pom
! install -p -m 644 %{name}-classic/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-classic.pom
! install -p -m 644 %{name}-access/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-access.pom
! install -p -m 644 %{name}-examples/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-examples.pom
  
  # javadoc
***************
*** 180,184 ****
  cp -rf target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %clean
--- 178,182 ----
  cp -rf target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %clean
***************
*** 194,208 ****
  %defattr(0644,root,root,0755)
  %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/*
! %{_datadir}/maven2/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
  * Fri Jun 12 2009 Ralph Apel <r.apel at r-apel.de> - 0:0.9.14-1.jpp5
  - first release
- 
--- 192,218 ----
  %defattr(0644,root,root,0755)
  %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/%{name}/access-%{version}.jar
! %{_javadir}/%{name}/%{name}/access.jar
! %{_javadir}/%{name}/%{name}/classic-%{version}.jar
! %{_javadir}/%{name}/%{name}/classic.jar
! %{_javadir}/%{name}/%{name}/core-%{version}.jar
! %{_javadir}/%{name}/%{name}/core.jar
! %{_javadir}/%{name}/%{name}/examples-%{version}.jar
! %{_javadir}/%{name}/%{name}/examples.jar
! %{_datadir}/maven2/poms/JPP.%{name}-access.pom
! %{_datadir}/maven2/poms/JPP.%{name}-classic.pom
! %{_datadir}/maven2/poms/JPP.%{name}-examples.pom
! %{_datadir}/maven2/poms/JPP.%{name}-parent.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
+ * Thu Jul 02 2009 David Walluck <dwalluck at redhat.com> 0:0.9.14-2
+ - spec cleanup
+ 
  * Fri Jun 12 2009 Ralph Apel <r.apel at r-apel.de> - 0:0.9.14-1.jpp5
  - first release




More information about the JPackage-commits mailing list