[Jpackage-commits] rpms/free/jtidy build.xml, 1.1, NONE jtidy-component-info.xml, NONE, 1.1 jtidy.jtidy.script, 1.4, 1.5 jtidy.spec, 1.7, 1.8 maven-build.properties, 1.1, NONE maven-build.xml, 1.1, NONE

jpackage jpackage at ryu.zarb.org
Mon Feb 2 23:54:04 CET 2009


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

Modified Files:
	jtidy.jtidy.script jtidy.spec 
Added Files:
	jtidy-component-info.xml 
Removed Files:
	build.xml maven-build.properties maven-build.xml 
Log Message:
7.0-0.V04aug2000r7_dev.1.jpp6

--- build.xml DELETED ---


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


    <export>
      <include input="jtidy.jar"/>

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

--- maven-build.properties DELETED ---

Index: jtidy.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jtidy/jtidy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** jtidy.spec	2 Oct 2008 17:12:47 -0000	1.7
--- jtidy.spec	2 Feb 2009 22:54:02 -0000	1.8
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 34,57 ****
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_with             maven
  
! %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
  %define section free
  
  Name:           jtidy
! Version:        8.0
! Release:        0.813.1%{?dist}
! Epoch:          1
  Summary:        HTML syntax checker and pretty printer
  License:        BSD
  Group:          Text Processing/Markup/HTML
  URL:            http://jtidy.sourceforge.net/
! # svn export -r813 http://svn.sourceforge.net/svnroot/jtidy/trunk/jtidy/ jtidy
! Source0:        jtidy-r813.tar.bz2
  Source1:        %{name}.jtidy.script
! Source2:        build.xml
! Source3:        maven-build.properties
! Source4:        maven-build.xml
  Requires:       xerces-j2
  Requires:       xml-commons-jaxp-1.3-apis
--- 34,65 ----
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without repolib
! %bcond_with maven
! %bcond_with gcj_support
  
! %if %with gcj_support
! %define gcj_support 1
! %else
! %define gcj_support 0
! %endif
! 
! %define repodir %{_javadir}/repository.jboss.com/%{name}/%{version}-brew
! %define repodirlib %{repodir}/lib
! %define repodirsrc %{repodir}/src
  
  %define section free
  
  Name:           jtidy
! Version:        7.0
! Release:        0.V04aug2000r7_dev.1%{?dist}
! Epoch:          2
  Summary:        HTML syntax checker and pretty printer
  License:        BSD
  Group:          Text Processing/Markup/HTML
  URL:            http://jtidy.sourceforge.net/
! # svn -q export https://svn.sourceforge.net/svnroot/jtidy/tags/V04aug2000r7-dev/jtidyr7/ jtidy && tar cjf jtidy.tar.bz2 jtidy
! Source0:        jtidy.tar.bz2
  Source1:        %{name}.jtidy.script
! Source2:        jtidy-component-info.xml
  Requires:       xerces-j2
  Requires:       xml-commons-jaxp-1.3-apis
***************
*** 91,136 ****
  Utility scripts for %{name}.
  
  %prep
  %setup -q -n %{name}
- %{__cp} -p %{SOURCE2} %{SOURCE3} %{SOURCE4} .
  
  %build
! export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mkdir -p $MAVEN_REPO_LOCAL
! export ANT_OPTS="-Xss1m"
! export CLASSPATH=$(build-classpath junit slf4j xerces-j2 xml-commons-jaxp-1.3-apis):`pwd`/target/classes:`pwd`/target/test-classes
  export OPT_JAR_LIST="junit ant/ant-junit"
! %{ant} \
!     -Dbuild.sysclasspath=only \
!     -Dmaven.mode.offline=true \
!     -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!     -Dmaven.test.skip=true \
!     -Dmaven.test.error.ignore=true \
!     package javadoc
  
  %install
! %__rm -rf %{buildroot}
  
  # jar
! %__mkdir_p %{buildroot}%{_javadir}
! %__cp -a target/jtidy-8.0-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
  # jar versioning
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do %__ln_s ${jar} `echo $jar| %__sed "s|-%{version}||g"`; done)
  
  # javadoc
! %__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
! %__cp -a target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! %__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  # shell script
! %__mkdir_p %{buildroot}%{_bindir}
! %__install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
  
  # ant.d
! %__mkdir_p %{buildroot}%{_sysconfdir}/ant.d
! %__cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
  jtidy xerces-j2 xml-commons-jaxp-1.3-apis
  EOF
  
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
--- 99,158 ----
  Utility scripts for %{name}.
  
+ %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 %{name}
  
  %build
! export CLASSPATH=$(build-classpath junit slf4j xerces-j2 xml-commons-jaxp-1.3-apis)
  export OPT_JAR_LIST="junit ant/ant-junit"
! %{ant} -Dbuild.compiler=modern -Dant.build.javac.source=1.4
  
  %install
! %{__rm} -rf %{buildroot}
  
  # jar
! %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p build/Tidy.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
  # jar versioning
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do %{__ln_s} ${jar} `/bin/echo $jar| %{__sed} "s|-%{version}||g"`; done)
  
  # javadoc
! %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__cp} -pr doc/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  # shell script
! %{__mkdir_p} %{buildroot}%{_bindir}
! %{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
  
  # ant.d
! %{__mkdir_p} %{buildroot}%{_sysconfdir}/ant.d
! %{__cat} > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
  jtidy xerces-j2 xml-commons-jaxp-1.3-apis
  EOF
  
+ %if %with repolib
+ %{__install} -d -m 0755 %{buildroot}%{repodir}
+ %{__install} -d -m 0755 %{buildroot}%{repodirlib}
+ %{__install} -p -m 0644 %{SOURCE2} %{buildroot}%{repodir}/component-info.xml
+ tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
+ %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
+ %{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
+ %{__install} -d -m 0755 %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{SOURCE0} %{buildroot}%{repodirsrc}
+ %{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{repodirsrc}
+ %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/%{name}.jar
+ %endif
+ 
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
***************
*** 138,142 ****
  
  %clean
! %__rm -rf %{buildroot}
  
  %if %{gcj_support}
--- 160,164 ----
  
  %clean
! %{__rm} -rf %{buildroot}
  
  %if %{gcj_support}
***************
*** 158,162 ****
--- 180,188 ----
  %files
  %defattr(0644,root,root,0755)
+ %if 0
  %doc LICENSE.txt
+ %else
+ %doc LICENSE NOTES
+ %endif
  %{_javadir}/%{name}.jar
  %{_javadir}/%{name}-%{version}.jar
***************
*** 174,180 ****
  %files scripts
  %defattr(0755,root,root,0755)
! %{_bindir}/*
  
  %changelog
  * Thu Oct 02 2008 David Walluck <dwalluck at redhat.com> 1:8.0-0.813.1
  - 8.0-SNAPSHOT
--- 200,216 ----
  %files scripts
  %defattr(0755,root,root,0755)
! %{_bindir}/%{name}
! 
! %if %with repolib
! %files repolib
! %defattr(0644,root,root,0755)
! %{_javadir}/repository.jboss.com
! %endif
  
  %changelog
+ * Mon Feb 02 2009 David Walluck <dwalluck at redhat.com> 2:7.0-0.V04aug2000r7_dev.1
+ - downgrade to 7.0 (4aug2000r7-dev)
+ - add repolib
+ 
  * Thu Oct 02 2008 David Walluck <dwalluck at redhat.com> 1:8.0-0.813.1
  - 8.0-SNAPSHOT

--- maven-build.xml DELETED ---




More information about the JPackage-commits mailing list