From 249dab0411055f14033160993ba67fda4dc056e3ea4db97de2d3535b0b41f4e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 8 Jul 2014 11:00:05 +0000 Subject: [PATCH] - Do not depend on ant-nodeps. OBS-URL: https://build.opensuse.org/package/show/Java:packages/appframework?expand=0&rev=15 --- appframework.changes | 5 +++++ appframework.spec | 21 ++++++++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/appframework.changes b/appframework.changes index d2e49b7..4f18101 100644 --- a/appframework.changes +++ b/appframework.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 8 10:59:55 UTC 2014 - tchvatal@suse.com + +- Do not depend on ant-nodeps. + ------------------------------------------------------------------- Mon Sep 9 11:05:30 UTC 2013 - tchvatal@suse.com diff --git a/appframework.spec b/appframework.spec index 562f0e1..6782e3f 100644 --- a/appframework.spec +++ b/appframework.spec @@ -1,7 +1,7 @@ # # spec file for package appframework # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,22 +28,19 @@ Patch0: %{name}-%{version}-no-local-storage.diff Patch1: %{name}-%{version}-openjdk.diff BuildRequires: ant BuildRequires: ant-junit -BuildRequires: ant-nodeps BuildRequires: java-devel BuildRequires: javapackages-tools BuildRequires: swing-layout >= 1.0.3 Requires: java Requires: javapackages-tools Requires: swing-layout >= 1.0.3 -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description The JSR-296 Swing Application Framework prototype implementation is a small set of Java classes that simplify building desktop applications. - - %package javadoc Summary: Swing Application Framework Group: Development/Libraries/Java @@ -52,12 +49,10 @@ Group: Development/Libraries/Java The JSR-296 Swing Application Framework prototype implementation is a small set of Java classes that simplify building desktop applications. - - %prep %setup -q -n AppFramework-%{version} # remove all binary libs -find . -name "*.jar" -exec %{__rm} -f {} \; +find . -name "*.jar" -exec rm -f {} \; %patch0 -b .sav %patch1 -p1 -b .sav @@ -66,12 +61,12 @@ find . -name "*.jar" -exec %{__rm} -f {} \; %install # jar -%{__install} -d -m 755 %{buildroot}%{_javadir} -%{__install} -m 644 dist/AppFramework-1.03.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 dist/AppFramework-1.03.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # javadoc -%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__cp} -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} %files %defattr(-,root,root,-)