From 6b0a28c2e0d1c263f4ee61aaa1e4c90e7f1b5e34 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Aug 05 2013 20:49:05 +0000 Subject: Fix build dependencies --- diff --git a/beansbinding.spec b/beansbinding.spec index 9be9de7..c4bad42 100644 --- a/beansbinding.spec +++ b/beansbinding.spec @@ -1,20 +1,19 @@ Name: beansbinding Version: 1.2.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Beans Binding (JSR 295) reference implementation Group: Development/Libraries License: LGPLv2+ URL: https://beansbinding.dev.java.net/ Source0: https://beansbinding.dev.java.net/files/documents/6779/73673/beansbinding-1.2.1-src.zip -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ant -BuildRequires: ant-nodeps -BuildRequires: ant-junit BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils +BuildRequires: ant +BuildRequires: ant-junit + Requires: java >= 1:1.6.0 Requires: jpackage-utils @@ -42,17 +41,12 @@ find . -type f \( -iname "*.jar" -o -iname "*.zip" \) -print0 | xargs -t -0 %{__ %{ant} dist %install -%{__rm} -rf %{buildroot} # jar %{__install} -d -m 755 %{buildroot}%{_javadir} -%{__install} -m 644 dist/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +%{__install} -m 644 dist/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar # javadoc -%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__cp} -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} - -%clean -%{__rm} -rf %{buildroot} +%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name} +%{__cp} -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} %files %defattr(-,root,root,-) @@ -61,10 +55,13 @@ find . -type f \( -iname "*.jar" -o -iname "*.zip" \) -print0 | xargs -t -0 %{__ %files javadoc %defattr(-,root,root,-) -%dir %{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name}-%{version}/* +%{_javadocdir}/%{name} %changelog +* Mon Aug 05 2013 Omair Majid - 1.2.1-11 +- Update to work with latest guidelines +- Fix build dependencies + * Sat Aug 03 2013 Fedora Release Engineering - 1.2.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild