Attachment 147809 Details for Bug 225954 – Spec File

[patch] Spec File

patch.diff (text/plain), 4.79 KB, created by Tania Bento on 2007-02-09 21:17:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tania Bento

Created: 2007-02-09 21:17:12 UTC

Size: 4.79 KB

patch

obsolete

>Index: junit.spec
>===================================================================
>RCS file: /cvs/dist/rpms/junit/devel/junit.spec,v
>retrieving revision 1.23
>diff -u -r1.23 junit.spec
>--- junit.spec	10 Aug 2006 22:35:41 -0000	1.23
>+++ junit.spec	9 Feb 2007 21:15:32 -0000
>@@ -5,7 +5,7 @@
> # modification, are permitted provided that the following conditions
> # are met:
> #
>-# 1. Redistributions of source code must retain the above copyright
>+# 1. Redistributions of source code must retain the above copyright 
> #    notice, this list of conditions and the following disclaimer.
> # 2. Redistributions in binary form must reproduce the above copyright
> #    notice, this list of conditions and the following disclaimer in the
>@@ -32,30 +32,30 @@
> 
> %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
>+%define        section         free
> 
>-Name:		junit
>-Version:	3.8.2
>-Release:	3jpp.1
>-Epoch:		0
>-Summary:	Java regression test package
>-License:	Common Public License
>-Url:		http://www.junit.org/
>-Group:		Development/Testing
>+Name:           junit
>+Version:        3.8.2
>+Release:        3jpp.1
>+Epoch:          0
>+Summary:        Java regression test package
>+License:        CPL
>+Url:            http://www.junit.org/
>+Group:          Development/Tools/Java
> #http://osdn.dl.sourceforge.net/junit/junit3.8.2.zip
>-Source0:	junit3.8.2-RHCLEAN.zip
>-Source1:	junit3.8.2-build.xml
>-BuildRequires:	ant
>-BuildRequires:	jpackage-utils >= 0:1.6
>-%if ! %{gcj_support}
>-Buildarch:	noarch
>-%endif
>-Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
>+Source0:        junit3.8.2.zip
>+Source1:        junit3.8.2-build.xml
>+BuildRequires:  ant
>+BuildRequires:  jpackage-utils >= 0:1.6
>+#%if ! %{gcj_support}
>+#Buildarch:     noarch
>+#%endif
>+Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
> 
> %if %{gcj_support}
>-BuildRequires:		java-gcj-compat-devel
>-Requires(post):		java-gcj-compat
>-Requires(postun):	java-gcj-compat
>+BuildRequires:          java-gcj-compat-devel
>+Requires(post):         java-gcj-compat
>+Requires(postun):       java-gcj-compat
> %endif
> 
> %description
>@@ -65,15 +65,15 @@
> hosted on SourceForge.
> 
> %package manual
>-Group:		Development/Testing
>-Summary:	Manual for %{name}
>+Group:          Development/Testing
>+Summary:        Manual for %{name}
> 
> %description manual
> Documentation for %{name}.
> 
> %package javadoc
>-Group:		Development/Documentation
>-Summary:	Javadoc for %{name}
>+Group:          Development/Documentation
>+Summary:        Javadoc for %{name}
> Requires(post):   /bin/rm,/bin/ln
> Requires(postun): /bin/rm
> 
>@@ -81,21 +81,20 @@
> Javadoc for %{name}.
> 
> %package demo
>-Group:		Development/Testing
>-Summary:	Demos for %{name}
>-Requires:	%{name} = %{version}-%{release}
>+Group:          Development/Testing
>+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
>+BuildRequires:          java-gcj-compat-devel
>+Requires(post):         java-gcj-compat
>+Requires(postun):       java-gcj-compat
> %endif
> 
> %description demo
> Demonstrations and samples for %{name}.
> 
> %prep
>-rm -rf $RPM_BUILD_ROOT
> %setup -q -n %{name}%{version}
> # extract sources
> jar xf src.jar
>@@ -106,6 +105,7 @@
> ant dist
> 
> %install
>+rm -rf $RPM_BUILD_ROOT
> # jars
> install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
> install -m 644 %{name}%{version}/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
>@@ -119,7 +119,8 @@
> cp -pr %{name}%{version}/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit
> 
> %if %{gcj_support}
>-%{_bindir}/aot-compile-rpm
>+# these --exclude options work around an aot-compile-rpm problem with test.jar
>+%{_bindir}/aot-compile-rpm --exclude usr/share/junit/demo --exclude usr/share/junit/demo/junit/tests/runner/test.jar
> %endif
> 
> %clean
>@@ -150,22 +151,6 @@
> fi
> %endif
> 
>-%post demo
>-%if %{gcj_support}
>-if [ -x %{_bindir}/rebuild-gcj-db ]
>-then
>-  %{_bindir}/rebuild-gcj-db
>-fi
>-%endif
>-
>-%postun demo
>-%if %{gcj_support}
>-if [ -x %{_bindir}/rebuild-gcj-db ]
>-then
>-  %{_bindir}/rebuild-gcj-db
>-fi
>-%endif
>-
> %files
> %defattr(0644,root,root,0755)
> %doc README.html
>@@ -188,11 +173,6 @@
> %defattr(0644,root,root,0755)
> %{_datadir}/%{name}
> 
>-%if %{gcj_support}
>-%dir %{_libdir}/gcj/%{name}
>-%attr(-,root,root) %{_libdir}/gcj/%{name}/demo.*
>-%endif
>-
> %changelog
> * Thu Aug 10 2006 Deepak Bhole <dbhole@redhat.com> -  0:3.8.2-3jpp.1
> - Added missing requirements.
>@@ -258,7 +238,7 @@
> - truncated description to 72 columns in spec
> - spec cleanup
> - used versioned jar
>-- moved demo files to %{_datadir}/%{name}
>+- moved demo files to %%{_datadir}/%%{name}
> 
> * Sat Feb 17 2001 Guillaume Rousse <g.rousse@linux-mandrake.com> 3.5-1mdk
> - first Mandrake release

Actions: View | Diff

Attachments on bug 225954: 147809 | 147817