[Jpackage-commits] dist/junit4/devel .cvsignore, 1.2, 1.3 junit-4.4.pom, 1.1, NONE junit4-4.4-AllTests.patch, 1.1, NONE junit4.spec, 1.1, 1.2 sources, 1.2, 1.3

David Walluck david at ryu.zarb.org
Sun Dec 12 00:32:30 CET 2010


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

Modified Files:
	.cvsignore junit4.spec sources 
Removed Files:
	junit-4.4.pom junit4-4.4-AllTests.patch 
Log Message:
- initial import

Index: junit4.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/junit4/devel/junit4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** junit4.spec	28 May 2008 19:03:21 -0000	1.1
--- junit4.spec	11 Dec 2010 23:32:28 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 29,74 ****
  #
  
- %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
- 
  Name:           junit4
! Version:        4.4
! Release:        1jpp
  Epoch:          0
  Summary:        Java regression test package
  License:        CPL
! Url:            http://www.junit.org/
  Group:          Development/Tools
! Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
! Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
! Source0:        junit-4.4.tar.gz
! # steps to reproduce
! # cvs -d:pserver:anonymous at junit.cvs.sourceforge.net:/cvsroot/junit login
! # cvs -z3 -d:pserver:anonymous at junit.cvs.sourceforge.net:/cvsroot/junit export -r r44 junit
! # mv junit junit-4.4
! # tar czf junit-4.4.tar.gz junit-4.4/
! 
! # Source1:        junit4.4-build.xml
! Source2:        junit-4.4.pom
! Patch0:         junit4-4.4-AllTests.patch
  BuildRequires:  ant
! BuildRequires:  dos2unix
! BuildRequires:  jpackage-utils >= 0:1.7.4
! BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  hamcrest
! Requires:  java >= 0:1.5.0
! Requires:  hamcrest
! %if ! %{gcj_support}
! Buildarch:     noarch
! %endif
! Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! 
! %if %{gcj_support}
! BuildRequires:          java-gcj-compat-devel
! Requires(post):         java-gcj-compat
! Requires(postun):       java-gcj-compat
! %endif
! 
! Requires(post):    jpackage-utils >= 0:1.7.4
! Requires(postun):  jpackage-utils >= 0:1.7.4
  
  %description
--- 29,55 ----
  #
  
  Name:           junit4
! Version:        4.8.2
! Release:        4%{?dist}
  Epoch:          0
  Summary:        Java regression test package
  License:        CPL
! URL:            http://www.junit.org/
  Group:          Development/Tools
! # git clone --bare git://github.com/KentBeck/junit.git junit.git
! # mkdir junit-4.8.2
! # git --git-dir=junit.git --work-tree=junit-4.8.2 checkout r4.8.2
! # tar cjf junit-4.8.2.tar.bz2 junit-4.8.2/
! Source0:        junit-%{version}.tar.bz2
! Requires(post): jpackage-utils >= 0:1.7.3
! Requires(postun): jpackage-utils >= 0:1.7.3
! Requires:       hamcrest
! Requires:       java-1.6.0
  BuildRequires:  ant
! BuildRequires:  jpackage-utils >= 0:1.7.3
! BuildRequires:  java-1.6.0-devel
  BuildRequires:  hamcrest
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 79,83 ****
  hosted on SourceForge.
  
- 
  %package manual
  Group:          Documentation
--- 60,63 ----
***************
*** 90,95 ****
  Group:          Documentation
  Summary:        Javadoc for %{name}
! Requires(post):   /bin/rm,/bin/ln
! Requires(postun): /bin/rm
  
  %description javadoc
--- 70,74 ----
  Group:          Documentation
  Summary:        Javadoc for %{name}
! Requires:       jpackage-utils
  
  %description javadoc
***************
*** 99,109 ****
  Group:          Development/Libraries
  Summary:        Demos for %{name}
! Requires:       %{name} = %{version}-%{release}
! 
! %if %{gcj_support}
! BuildRequires:          java-gcj-compat-devel
! Requires(post):         java-gcj-compat
! Requires(postun):       java-gcj-compat
! %endif
  
  %description demo
--- 78,82 ----
  Group:          Development/Libraries
  Summary:        Demos for %{name}
! Requires:       %{name} = %{epoch}:%{version}-%{release}
  
  %description demo
***************
*** 112,213 ****
  %prep
  %setup -q -n junit-%{version}
! for j in $(find . -name "*.jar"); do
!     mv $j $j.no
! done
! ln -sf $(build-classpath hamcrest/core) lib/hamcrest-core-1.1.jar
! rm src/org/junit/tests/BothTest.java
! %patch0 -b .sav0
  
  %build
! export JAVA_HOME=%{_jvmdir}/java-1.5.0
! ant dist
! 
! find -name \*.htm -o -name \*.html | xargs dos2unix
  
  %install
! rm -rf $RPM_BUILD_ROOT
  
  # jars
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 junit%{version}/junit-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! pushd $RPM_BUILD_ROOT%{_javadir} 
! ln -sf %{name}-%{version}.jar %{name}.jar
  popd
  # pom
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap junit junit %{version} JPP %{name}
  # javadoc
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/junit-%{version}
! cp -pr junit%{version}/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/junit-%{version}
  # demo
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit # Not using %name for last part because it is 
                                                                  # part of package name
! cp -pr junit%{version}/junit/* $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit
! 
! %if %{gcj_support}
! # these --exclude options work around an aot-compile-rpm problem with test.jar
! %{_bindir}/aot-compile-rpm \
!      --exclude usr/share/%{name}/demo \
!      --exclude usr/share/%{name}/demo/junit/tests/runner/test.jar
! %endif 
! 
! ln -s junit-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %clean
! 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
- %if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
  
  %postun
  %update_maven_depmap
- %if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
  
  %files
  %defattr(0644,root,root,0755)
  %doc cpl-v10.html README.html
! %{_javadir}/*
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
! %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/junit-%{version}.jar.*
! %endif
  
! %files manual
  %defattr(0644,root,root,0755)
! %doc junit%{version}/doc/*
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/junit-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
! %files demo
  %defattr(0644,root,root,0755)
! %{_datadir}/%{name}
  
  %changelog
  * Thu Mar 06 2008 Ralph Apel <r.apel at r-apel.de> - 0:4.4-1jpp
  - 4.4
--- 85,189 ----
  %prep
  %setup -q -n junit-%{version}
! %{_bindir}/find -type f -name "*.jar" | %{_bindir}/xargs -t %{__rm}
! ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.1.jar
! perl -pi -e 's/\r$//g' stylesheet.css
  
  %build
! export CLASSPATH=
! export OPT_JAR_LIST=:
! %{ant} -Dant.build.javac.source=1.5 dist
  
  %install
! rm -rf %{buildroot}
  
  # jars
! install -d -m 755 %{buildroot}%{_javadir}
! install -p -m 644 junit%{version}/junit-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! pushd %{buildroot}%{_javadir} 
! ln -s %{name}-%{version}.jar %{name}.jar
  popd
+ 
  # pom
! install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! install -p -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap junit junit %{version} JPP %{name}
+ 
  # javadoc
! install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr junit%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
! 
  # demo
! install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/junit # Not using %%name for last part because it is 
                                                                  # part of package name
! cp -pr junit%{version}/junit/* %{buildroot}%{_datadir}/%{name}/demo/junit
  
  %clean
! rm -rf %{buildroot}
  
  %post
  %update_maven_depmap
  
  %postun
  %update_maven_depmap
  
  %files
  %defattr(0644,root,root,0755)
  %doc cpl-v10.html README.html
! %{_javadir}*/%{name}.jar
! %{_javadir}*/%{name}-%{version}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
! %files demo
  %defattr(0644,root,root,0755)
! %{_datadir}/%{name}
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
! %files manual
  %defattr(0644,root,root,0755)
! %doc junit%{version}/doc/*
  
  %changelog
+ * Thu Dec 09 2010 David Walluck <dwalluck at redhat.com> 0:4.8.2-4
+ - remove pom patch as it's causing too many pom changes
+ 
+ * Wed Dec 08 2010 David Walluck <dwalluck at redhat.com> 0:4.8.2-3
+ - update file list for brew
+ 
+ * Wed Dec 08 2010 David Walluck <dwalluck at redhat.com> 0:4.8.2-2
+ - change artifactId to junit4 to allow co-existence with junit
+ 
+ * Tue Jun 15 2010 Alexander Kurtakov <akurtako at redhat.com> 0:4.8.2-1
+ - Update to 4.8.2.
+ - Drop gcj support.
+ - Javadoc subpackage requires jpackage-utils.
+ 
+ * Sat Oct 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 0:4.6-1
+ - Update to 4.6
+ 
+ * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:4.5-5.1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+ 
+ * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:4.5-4.1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+ 
+ * Mon Oct 20 2008 David Walluck <dwalluck at redhat.com> 0:4.5-3.1
+ - build for Fedora
+ 
+ * Mon Oct 20 2008 David Walluck <dwalluck at redhat.com> 0:4.5-3
+ - reorder %%files list
+ 
+ * Mon Oct 20 2008 David Walluck <dwalluck at redhat.com> 0:4.5-2
+ - fix GCJ support
+ - fix javadoc symlink
+ 
+ * Mon Oct 20 2008 David Walluck <dwalluck at redhat.com> 0:4.5-1
+ - 4.5
+ 
  * Thu Mar 06 2008 Ralph Apel <r.apel at r-apel.de> - 0:4.4-1jpp
  - 4.4

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/junit4/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	28 May 2008 19:03:21 -0000	1.2
--- sources	11 Dec 2010 23:32:28 -0000	1.3
***************
*** 1 ****
! d42617f732c41c7994b4c0e7f00bfa87  junit-4.4.tar.gz
--- 1 ----
! a231dd14bb9bfb89db2360326a2445d9  junit-4.8.2.tar.bz2

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/junit4/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	28 May 2008 19:03:21 -0000	1.2
--- .cvsignore	11 Dec 2010 23:32:28 -0000	1.3
***************
*** 1 ****
! junit-4.4.tar.gz
--- 1 ----
! junit-4.8.2.tar.bz2

--- junit-4.4.pom DELETED ---

--- junit4-4.4-AllTests.patch DELETED ---




More information about the JPackage-commits mailing list