Attachment 211381 Details for Bug 302361 – Suggested specfile changes

[patch] Suggested specfile changes

freecol.patch (text/plain), 1.23 KB, created by Ville Skyttä on 2007-09-29 15:18:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2007-09-29 15:18:21 UTC

Size: 1.23 KB

patch

obsolete

>--- freecol.spec~	2007-09-23 23:14:53.000000000 +0300
>+++ freecol.spec	2007-09-29 17:50:40.000000000 +0300
>@@ -17,12 +17,12 @@
> Source2:        %{name}.desktop
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires:  ant ant-nodeps xml-commons-apis xml-commons-resolver latex2html
>-BuildRequires:  wstx higlayout ImageMagick desktop-file-utils
>+BuildRequires:  higlayout ImageMagick desktop-file-utils
> # Doesn't run with gcj, so better build it with icedtea too
> BuildRequires:  java-1.7.0-icedtea-devel
> BuildArch:      noarch
> Requires:       java-1.7.0-icedtea jpackage-utils hicolor-icon-theme
>-Requires:       wstx higlayout
>+Requires:       higlayout
> # icedtea is i386 and x86_64 only
> ExclusiveArch:  %{ix86} x86_64
> 
>@@ -43,11 +43,10 @@
> %prep
> %setup -q -n %{name}
> sed -i 's|htlatex|latex2html|g' build.xml
>-sed -i 's|Class-Path: jars/higlayout.jar jars/jsr173_1.0_api.jar jars/wstx-lgpl-4.0pr1.jar||g' \
>-   src/MANIFEST.MF
>-# build against the system version of wstx and higlayout
>+sed -i '/Class-Path:/d' src/MANIFEST.MF
>+# build against the system version of higlayout and StAX
> rm jars/*
>-ln -s %{_javadir}/wstx/wstx-lgpl.jar %{_javadir}/higlayout.jar jars
>+ln -s %{_javadir}/higlayout.jar jars
> 
> 
> %build

Actions: View | Diff

Attachments on bug 302361: 211381 | 211891