rpms/junit4/devel sources, 1.4, 1.5 junit4.spec, 1.14, 1.15 .cvsignore, 1.4, 1.5 junit-4.6.pom, 1.1, NONE junit-4.5.pom, 1.1, NONE

Tue Jun 15 09:26:48 UTC 2010

Author: akurtakov

Update of /cvs/pkgs/rpms/junit4/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14586/devel

Modified Files:
	sources junit4.spec .cvsignore 
Removed Files:
	junit-4.6.pom junit-4.5.pom 
Log Message:
* 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/junit4/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5

--- sources	9 Nov 2009 08:21:14 -0000	1.4
+++ sources	15 Jun 2010 09:26:48 -0000	1.5
@@ -1 +1,2 @@
 1d1de7ef156da65d2b980664d780f0c8  junit-4.6.tar.bz2
+a231dd14bb9bfb89db2360326a2445d9  junit-4.8.2.tar.bz2


Index: junit4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/junit4/devel/junit4.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- junit4.spec	9 Nov 2009 08:21:14 -0000	1.14
+++ junit4.spec	15 Jun 2010 09:26:48 -0000	1.15
@@ -28,11 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%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.6
+Version:        4.8.2
 Release:        1%{?dist}
 Epoch:          0
 Summary:        Java regression test package
@@ -40,11 +37,10 @@ License:        CPL
 URL:            http://www.junit.org/
 Group:          Development/Tools
 # git clone --bare git://github.com/KentBeck/junit.git junit.git
-# mkdir junit-4.6
-# git --git-dir=junit.git --work-tree=junit-4.6 checkout r4.6
-# tar cjf junit-4.6.tar.bz2 junit-4.6/
+# 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
-Source1:        junit-%{version}.pom
 Requires(post): jpackage-utils >= 0:1.7.4
 Requires(postun): jpackage-utils >= 0:1.7.4
 Requires:       hamcrest
@@ -53,11 +49,7 @@ BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.7.4
 BuildRequires:  java-1.6.0-devel
 BuildRequires:  hamcrest
-%if %{gcj_support}
-BuildRequires:  java-gcj-compat-devel
-%else
-Buildarch:      noarch
-%endif
+BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -77,6 +69,7 @@ Documentation for %{name}.
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -112,7 +105,7 @@ popd
 
 # pom
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
 %add_to_maven_depmap junit junit %{version} JPP %{name}
 
 # javadoc
@@ -121,34 +114,18 @@ cp -pr junit%{version}/javadoc/* $RPM_BU
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # demo
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit # Not using %name for last part because it is 
+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}
-%{_bindir}/aot-compile-rpm
-%endif 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %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)
@@ -157,19 +134,10 @@ fi
 %{_javadir}/%{name}-%{version}.jar
 %{_datadir}/maven2/*
 %{_mavendepmapfragdir}/*
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.db
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.so
-%endif
 
 %files demo
 %defattr(0644,root,root,0755)
 %{_datadir}/%{name}
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/demo.db
-%attr(-,root,root) %{_libdir}/gcj/%{name}/demo.so
-%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -181,6 +149,11 @@ fi
 %doc junit%{version}/doc/*
 
 %changelog
+* 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
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/junit4/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Nov 2009 08:21:14 -0000	1.4
+++ .cvsignore	15 Jun 2010 09:26:48 -0000	1.5
@@ -1 +1,2 @@
 junit-4.6.tar.bz2
+junit-4.8.2.tar.bz2


--- junit-4.6.pom DELETED ---


--- junit-4.5.pom DELETED ---

