Attachment 147939 Details for Bug 227061 – This should clear up the issues with the review.

[patch] This should clear up the issues with the review.

isorelax.spec.patch (text/plain), 5.27 KB, created by Andrew Overholt on 2007-02-12 21:28:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Overholt

Created: 2007-02-12 21:28:35 UTC

Size: 5.27 KB

patch

obsolete

>--- isorelax-0.1-0.20041111.2jpp.spec	2007-02-01 17:06:29.000000000 -0500
>+++ isorelax.spec	2007-02-12 15:58:03.000000000 -0500
>@@ -28,95 +28,66 @@
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> #
> 
>-# If you want to run the tests, xercesjarv being available,
>-# give rpmbuild option '--with tests'
>+%define cvstag  release-20050331
> 
>-%define with_tests %{?_with_tests:1}%{!?_with_tests:0}
>-%define without_tests %{!?_with_tests:1}%{?_with_tests:0}
>-
>-
>-%define	section		free
>-%define	cvsversion	20041111
>-
>-Name:		isorelax
>-Summary:	Public interfaces useful for applications to support RELAX Core
>-Url:		http://iso-relax.sourceforge.net/
>-Version:	0.1
>-Release:	0.%{cvsversion}.2jpp
>-Epoch:		0
>-License:	MIT-style
>-Group:		Development/Libraries/Java
>-Vendor:		JPackage Project
>-Distribution:	JPackage
>-BuildArch:	noarch
>-Source0:	%{name}.%{cvsversion}.zip
>-Source1:	%{name}-build.xml
>-Source2:	isorelax-maven-project.xml
>-Source3:	isorelax-maven-project.xsd
>+Name:           isorelax
>+Summary:        Public interfaces for RELAX Core
>+Url:            http://iso-relax.sourceforge.net/
>+Epoch:          1
>+Version:        0
>+# I can't use %%{cvstag} as dashes aren't allowed in Release tags
>+Release:        0.1.release20050331.1jpp.1%{?dist}
>+License:        MIT-style
>+Group:          Development/Libraries/Java
>+BuildArch:      noarch
>+
>+# mkdir isorelax-release-20050331-src
>+# cd isorelax-release-20050331-src
>+# cvs -d:pserver:anonymous@iso-relax.cvs.sourceforge.net:/cvsroot/iso-relax \
>+#   export -r release-20050331 src lib
>+# cvs -d:pserver:anonymous@iso-relax.cvs.sourceforge.net:/cvsroot/iso-relax \
>+#   co -r release-20050331 build.xml
>+# rm -rf CVS
>+# cd ..
>+# tar cjf isorelax-release-20050331-src.tar.bz2 isorelax-release-20050331-src
>+Source0:        %{name}-%{cvstag}-src.tar.bz2
>+Patch0:         %{name}-apidocsandcompressedjar.patch
> 
> BuildRequires:  jpackage-utils >= 0:1.6
>-BuildRequires:	ant
>-%if %{with_tests}
>-BuildRequires:	xercesjarv
>-%endif
>-BuildRequires:	xerces-j2
>-BuildRequires:	xml-commons-apis
>-Requires:	xerces-j2
>-Requires:	xml-commons-apis
>-Obsoletes:	isorelax-bootstrap
>-Provides:	isorelax-bootstrap
>-BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
>+BuildRequires:  ant
>+BuildRequires:  xerces-j2
>+BuildRequires:  xml-commons-apis
>+Requires:       xerces-j2
>+Requires:       xml-commons-apis
>+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> %description
>-The ISO RELAX project is started to host the public interfaces 
>-useful for applications to support RELAX Core. But nowadays 
>-some of the stuff we have is schema language neutral.
>+The ISO RELAX project was started to host public interfaces 
>+useful for applications to support RELAX Core. Now, however,
>+some of the hosted material is schema language-neutral.
> 
> %package javadoc
>-Summary:	Javadoc for %{name}
>-Group:		Development/Documentation
>+Summary:        Javadoc for %{name}
>+Group:          Development/Documentation
> 
> %description javadoc
> Javadoc for %{name}.
> 
> %prep
>-cat <<EOT
>-
>-		If you want to run the tests,
>-		xercesjarv being available ,
>-		give rpmbuild option '--with tests'
>-
>-EOT
>-
>-%setup -T -c -n %{name}-%{version}
>-unzip -q %{SOURCE0}
>-mkdir src
>-(cd src; unzip -q ../src.zip)
>-rm -f src.zip
>-cp %{SOURCE1} build.xml
>-mkdir test
>-cp %{SOURCE2} test
>-cp %{SOURCE3} test
>-chmod -R go=u-w *
>+%setup -q -n %{name}-%{cvstag}-src
> find . -name "*.jar" -exec rm -f {} \;
>-rm -rf src/jp/gr/xml/relax/swift
>+ln -s %{_javadir}/ant.jar lib/
>+%patch0 -p0
> 
> %build
> export CLASSPATH=$(build-classpath \
> xerces-j2 \
> xml-commons-apis \
> )
>-%if %{with_tests}
>-CLASSPATH=$CLASSPATH:$(build-classpath xercesjarv)
>-ln -s $(find-jar xercesjarv) xercesjarv.jar
>-%endif
>-ant -Dbuild.sysclasspath=only release
>-%if %{with_tests}
>-CLASSPATH=isorelax.jar:$CLASSPATH
>-ant -Dbuild.sysclasspath=first ant-task-test
>-%endif
>+ant release
> 
> %install
>+rm -rf $RPM_BUILD_ROOT
> # jars
> install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
> install -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
>@@ -125,32 +96,30 @@
> # javadoc
> install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
> cp -pr apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
>-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
>+ln -s %{name}-%{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
>-
>-
> %files
> %defattr(-,root,root)
>-%doc COPYING.txt
> %{_javadir}/*
> 
> %files javadoc
> %defattr(-,root,root)
>-%{_javadocdir}/%{name}-%{version}
>-%ghost %doc %{_javadocdir}/%{name}
>+%{_javadocdir}/*
> 
> %changelog
>+* Mon Feb 12 2007 Andrew Overholt <overholt@redhat.com> 1:0-0.1.release20050331.1jpp.1
>+- Clean up
>+- Remove tests
>+- Fix e:nvr for new scheme (0.Z.tag.Xjpp.Y%%{?dist}) and bump epoch for
>+  upgrades
>+- Add instructions for how to create source drop
>+- Don't do javadoc symlinking in %%post{,un}
>+- Remove Obsoletes and Provides on isorelax-bootstrap as they were never
>+  shipped in Fedora and I don't know what version to Obsolete/Provide
>+
> * Wed Mar 22 2006 Ralph Apel <r.apel at r-apel.de> 0:0.1-0.20041111.2jpp
> - By default omit tests requiring xercesjarv
> - Add postun for javadoc

Actions: View | Diff

Attachments on bug 227061: 147939