From d7d2afb0995c0292960ffdd65e633b33f942291b Mon Sep 17 00:00:00 2001 From: Jiri Vanek work Date: Mar 11 2014 18:05:23 +0000 Subject: Fixed License, baseurl, removed legacy calls --- diff --git a/system-switch-java.spec b/system-switch-java.spec index 54444c6..fb0f149 100644 --- a/system-switch-java.spec +++ b/system-switch-java.spec @@ -1,17 +1,16 @@ Name: system-switch-java Version: 1.1.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A tool for changing the default Java toolset -%define url https://fedorahosted.org +%define baseurl https://fedorahosted.org Group: Applications/System -License: GPLv2+ -URL: %{url}/%{name} -Source0: %{url}/releases/s/y/system-switch-java/%{name}-%{version}.tar.gz +License: GPLv2+ and BSD +URL: %{baseurl}/%{name} +Source0: %{baseurl}/releases/s/y/system-switch-java/%{name}-%{version}.tar.gz # Patch is upstream but not in a release https://fedorahosted.org/system-switch-java/changeset/80 Patch0: new-jdk-paths.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: desktop-file-utils @@ -41,15 +40,12 @@ the default Java toolset for the system. make %{?_smp_mflags} %install -rm -rf %{buildroot} make DESTDIR=%{buildroot} install %find_lang %{name} desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop -%clean -rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root) @@ -67,6 +63,12 @@ rm -rf %{buildroot} %config(noreplace) /etc/security/console.apps/%{name} %changelog +* Tue Mar 11 2011 Jiri Vanek - 1.1.5-10 +- Renamed (to baseurl) url macro to prevent shadowing +- Added BSD license to list of Licenses + - (COPYING.icon says it's a 2-clause BSD license) +- removed buildroot definition and manual removing of it + * Fri Feb 21 2014 Omair Majid - 1.1.5-9 - Remove libuser-python dependency