Accepting request 104972 from network

patch license to follow spdx.org standard (forwarded request 104569 from coolo)

OBS-URL: https://build.opensuse.org/request/show/104972
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/unison?expand=0&rev=25
This commit is contained in:
Stephan Kulow 2012-02-16 14:02:33 +00:00 committed by Git OBS Bridge
parent 3cc43849ef
commit ade22d2df8
3 changed files with 33 additions and 6 deletions

13
build-fix-EG11.1.patch Normal file
View File

@ -0,0 +1,13 @@
Index: unison-2.40.61/uigtk2.ml
===================================================================
--- unison-2.40.61.orig/uigtk2.ml
+++ unison-2.40.61/uigtk2.ml
@@ -2608,7 +2608,7 @@ let twoBoxAdvanced
let summaryBox ~parent ~title ~message ~f =
let t =
GWindow.dialog ~parent ~border_width:6 ~modal:true ~no_separator:true
- ~allow_grow:false ~focus_on_map:false () in
+ ~allow_grow:false () in
t#vbox#set_spacing 12;
let h1 = GPack.hbox ~border_width:6 ~spacing:12 ~packing:t#vbox#pack () in
ignore (GMisc.image ~stock:`DIALOG_INFO ~icon_size:`DIALOG

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Feb 13 10:57:21 UTC 2012 - coolo@suse.com
- patch license to follow spdx.org standard
-------------------------------------------------------------------
Mon Jun 6 14:30:34 UTC 2011 - mhopf@novell.com
- Make unison build on Evergreen 11.1.
-------------------------------------------------------------------
Fri Apr 29 09:13:36 UTC 2011 - mhopf@novell.com

View File

@ -1,7 +1,7 @@
#
# spec file for package unison
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 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
@ -16,26 +16,27 @@
#
Name: unison
Version: 2.40.63
Release: 1
Release: 0
Summary: A file synchronization tool
License: GPL-3.0+
Group: Productivity/Networking/Other
License: GPLv3+
Url: http://www.cis.upenn.edu/~bcpierce/unison
Source0: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}.tar.gz
Source1: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}-manual.html
Source2: %{name}.desktop
Source3: %{name}.png
Patch0: build-fix-EG11.1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gtk2-devel ncurses-devel update-desktop-files
BuildRequires: gtk2-devel
BuildRequires: ncurses-devel
BuildRequires: update-desktop-files
%if 0%{?suse_version} > 1020
BuildRequires: lablgtk2-devel
%else
BuildRequires: lablgtk2
%endif
AutoReqProv: on
%description
Unison is a file synchronization tool for Unix and Windows. It allows
@ -46,6 +47,9 @@ replica to the other.
%prep
%setup -q
%if 0%{?suse_version} == 01110
%patch -p1
%endif
%build
# This package failed when testing with -Wl,-as-needed being default.