From 0228c2b5bce14dc604e916551c7159568083c2a537df57b89b46f9460fe2b5f1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 2 Dec 2011 07:17:40 +0000 Subject: [PATCH 1/2] Accepting request 94817 from home:coolo:removeautomake add automake to buildrequires OBS-URL: https://build.opensuse.org/request/show/94817 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/fvwm2?expand=0&rev=15 --- fvwm2.changes | 5 +++++ fvwm2.spec | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/fvwm2.changes b/fvwm2.changes index 607e6fe..27afe45 100644 --- a/fvwm2.changes +++ b/fvwm2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 1 17:06:01 UTC 2011 - coolo@suse.com + +- add automake as buildrequire to avoid implicit dependency + ------------------------------------------------------------------- Thu Sep 1 15:21:45 UTC 2011 - pgajdos@suse.com diff --git a/fvwm2.spec b/fvwm2.spec index 32fc5ed..779dd3e 100644 --- a/fvwm2.spec +++ b/fvwm2.spec @@ -15,18 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: fvwm2 -BuildRequires: freetype2-devel fribidi-devel gcc-c++ libpng-devel libstroke-devel pkgconfig readline-devel update-desktop-files xorg-x11-devel -License: GPLv2+ +BuildRequires: automake +BuildRequires: freetype2-devel +BuildRequires: fribidi-devel +BuildRequires: gcc-c++ +BuildRequires: libpng-devel +BuildRequires: libstroke-devel +BuildRequires: pkgconfig +BuildRequires: readline-devel +BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel +License: GPL-2.0+ Group: System/GUI/Other Provides: fvwm fvwmicns windowmanager xpmroot Obsoletes: fvwm xpmroot -AutoReqProv: on Version: 2.5.26 -Release: 55 +Release: 0 Summary: Improved Version of FVWM Window Manager Url: http://www.fvwm.org Source0: fvwm-%{version}.tar.bz2 From 1a0d03ca6cbe2b59484e075c8abc31538968b57b1415fcb509b8766513e2f29f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 2 Dec 2011 07:37:20 +0000 Subject: [PATCH 2/2] - remove uncommented patch OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/fvwm2?expand=0&rev=16 --- fvwm-2.5.26-utf_encoding.patch | 12 ------------ fvwm2.changes | 5 +++++ fvwm2.spec | 1 - 3 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 fvwm-2.5.26-utf_encoding.patch diff --git a/fvwm-2.5.26-utf_encoding.patch b/fvwm-2.5.26-utf_encoding.patch deleted file mode 100644 index 2b033e3..0000000 --- a/fvwm-2.5.26-utf_encoding.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libs/FlocaleCharset.c -+++ libs/FlocaleCharset.c -@@ -521,7 +521,7 @@ - } - if (FLCXOMCharsetList_num > 0 && FLCXOMCharsetList[0]) - { -- FLCXOMCharset = FLCXOMCharsetList[0]; -+ FLCXOMCharset = FLCXOMCharsetList[FLCXOMCharsetList_num - 1]; - } - #endif - } - diff --git a/fvwm2.changes b/fvwm2.changes index 27afe45..a78720a 100644 --- a/fvwm2.changes +++ b/fvwm2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 2 07:36:42 UTC 2011 - coolo@suse.com + +- remove uncommented patch + ------------------------------------------------------------------- Thu Dec 1 17:06:01 UTC 2011 - coolo@suse.com diff --git a/fvwm2.spec b/fvwm2.spec index 779dd3e..227bac1 100644 --- a/fvwm2.spec +++ b/fvwm2.spec @@ -46,7 +46,6 @@ Patch0: fvwm-configure.patch Patch1: fvwm-%{version}-gcc-warnings.patch Patch2: fvwm-%{version}-ia64.patch Patch3: fvwm-%{version}-sv_SE.patch -#Patch4: fvwm-%{version}-utf_encoding.patch Patch5: fvwm-%{version}-charset_in_title.patch Patch6: fvwm-2.5.26-libpng.patch Patch7: fvwm-%{version}-no-copy-dt-needed-entries.patch