rpms/jline/devel jline.spec,1.6,1.7

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/jline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10958/devel

Modified Files:
	jline.spec 
Log Message:
* Tue Jan 12 2010 Alexander Kurtakov <akurtako at redhat.com> 0:0.9.94-0.5
- Fix BRs.
- Drop gcj_support.


Index: jline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jline/devel/jline.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- jline.spec	25 Jul 2009 04:03:00 -0000	1.6
+++ jline.spec	12 Jan 2010 20:45:11 -0000	1.7
@@ -28,10 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _without_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}}}
-
 %define _with_maven 1
 
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
@@ -42,7 +38,7 @@
 
 Name:           jline
 Version:        0.9.94
-Release:        0.4%{?dist}
+Release:        0.5%{?dist}
 Epoch:          0
 Summary:        Java library for reading and editing user input in console applications
 License:        BSD
@@ -60,7 +56,8 @@ BuildRequires:  xml-commons-resolver
 BuildRequires:  maven2
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-assembly
@@ -71,17 +68,9 @@ BuildRequires:  ant-apache-resolver
 BuildRequires:  ant
 BuildRequires:  junit
 %endif
-%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
-
 %description
 JLine is a java library for reading and editing user input in console
 applications. It features tab-completion, command history, password
@@ -92,12 +81,6 @@ chain to other console applications.
 Summary:        Demos for %{name}
 Group:          Development/Documentation
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description    demo
 Demonstrations and samples for %{name}.
 
@@ -108,12 +91,6 @@ Demonstrations and samples for %{name}.
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description    javadoc
 Javadoc for %{name}.
 %endif
@@ -177,30 +154,10 @@ done
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
 %endif
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_DIR/META-INF
 
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}.jar
@@ -208,24 +165,16 @@ fi
 %doc LICENSE.txt
 
 %if %{with_maven}
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jline-0.9.9.jar.*
-%endif
-
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/*
 %endif
 
-#FIXME: add javadoc support to generated build.xml
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jline-0.9.9.jar.*
-%endif
-
 %changelog
+* Tue Jan 12 2010 Alexander Kurtakov <akurtako at redhat.com> 0:0.9.94-0.5
+- Fix BRs.
+- Drop gcj_support.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:0.9.94-0.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild