Hello community, here is the log from the commit of package fvwm2 for openSUSE:Factory checked in at 2017-02-09 11:18:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fvwm2 (Old) and /work/SRC/openSUSE:Factory/.fvwm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fvwm2" Changes: -------- --- /work/SRC/openSUSE:Factory/fvwm2/fvwm2.changes 2016-08-20 12:27:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fvwm2.new/fvwm2.changes 2017-02-09 11:18:59.666394708 +0100 @@ -1,0 +2,54 @@ +Tue Feb 7 11:14:39 UTC 2017 - wer...@suse.de + +- Update to 2.6.7 (06-Nov-2016) + - dropped fvwm-icon-440d675d14412ec0a123d4c977534ab688229148.patch + * New fvwm features: + A new default configuration which is available when fvwm + doesn't detect a configuration file to load. + A new conditional command "Desk n" can restrict matching + windows to a specific desk. + A new conditional command "Screen n" to restrict matching + windows on a given Xinerama screen. + New expansion variable "w.screen" to ascertain the Xineram + screen number a window is on. + New command "InfoStoreClear" to remove all items in the + InfoStore. + * Removed features: + The old and unmaintained debian/ and rpm/ directories have + been removed; use the maintainers' copies where available. + VMS support has been removed. + GTK1.x support has been removed. + GNOME-specific window hints (pre-EWMH) have been removed. + Some fvwm modules have been removed: + FvwmDragWell (no replacement) + FvwmGTK (no replacement) + FvwmSave (no replacement) + FvwmSaveDesk (no replacement) + FvwmScroll (no replacement) + FvwmTabs (no replacement, never worked anyway) + FvwmTaskBar (use FvwmButtons) + FvwmTheme (in core of fvwm as colorsets) + FvwmWharf (use FvwmButtons) + FvwmWinList (use WindowList command) + FvwmWindowMenu (use WindowList command) + FvwmIconBox (use the IconBox style instead) + * New module features: + FvwmButtons learned a new option "Colorset" to its + ChangeButton command. + * fvwm-menu-desktop updated: + Renamed default menu to XDGMenu and changed the name + of the FvwmForm to FvwmForm-XDGMenu-Config to not conflict + with someone already using FvwmMenu. + fvwm-menu-desktop will now load defaults from the + FvwmForm-XDGMenu-Config data file. + Improved dynamic menus by regenerating them on-the-fly. + Added new options: --regen-cmd, --dynamic, and more. + * Bug fixes: + A bug introduced in 2.6.6 could cause applications with + negative coordinates to be placed at strange positions. This + affected for example acroread when switching to fullscreen + mode. This has been fixed. + FvwmButtons "Silent" option for dynamic ChangeButton commands + no longer loops infinitely. + +------------------------------------------------------------------- Old: ---- fvwm-2.6.6.tar.bz2 fvwm-icon-440d675d14412ec0a123d4c977534ab688229148.patch New: ---- fvwm-2.6.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fvwm2.spec ++++++ --- /var/tmp/diff_new_pack.N0dJlg/_old 2017-02-09 11:19:00.534271915 +0100 +++ /var/tmp/diff_new_pack.N0dJlg/_new 2017-02-09 11:19:00.538271349 +0100 @@ -1,7 +1,7 @@ # # spec file for package fvwm2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: fvwm2 -Version: 2.6.6 +Version: 2.6.7 Release: 0 Summary: Improved Version of FVWM Window Manager License: GPL-2.0+ @@ -39,8 +39,6 @@ #PATCH-FIX-OPENSUSE Avoid including internal rsvg-cairo.h Patch8: fvwm-rsvg.patch Patch10: fvwm-no-date-time.patch -#PATCH-FIX-UPSTREAM issue #11 -- pgn/xpm icons with transparent background do not work with 2.6.6 -Patch11: fvwm-icon-440d675d14412ec0a123d4c977534ab688229148.patch BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libpng-devel @@ -100,12 +98,9 @@ %patch3 -b .p3 %patch5 -b .p5 %patch7 -p1 -b .p7 -%if 0%{?suse_version} > 1220 %patch8 -b .p8 -%endif %patch10 -b .p10 -%patch11 -b .p11 -p1 -find . -name *sv_SE* |xargs rename sv_SE sv +find . -name *sv_SE* -exec rename --verbose sv_SE sv '{}' \+ mkdir icons tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2 cp %{SOURCE6} icons @@ -140,24 +135,36 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/X11/fvwm2 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/fvwm2/system.fvwm2rc # -# some extra utils -install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils -install utils/quantize_pixmaps %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils -# # documentation for modules -rm sample.fvwmrc/Makefile* sample.fvwmrc/system.fvwm2rc-sample-95 -rm docs/Makefile* +rm -vf sample.fvwmrc/Makefile* sample.fvwmrc/system.fvwm2rc-sample-95 +rm -vf docs/Makefile* install -d -m 755 docu-module -for i in `find -name "README*" ! -name "*,v" ! -name "*.orig"` +for i in $(find -name "README*" -not -name "*,v" -and -not -name "*.orig") do - TMPDIR=`dirname ${i#./}` + TMPDIR=$(dirname ${i#./}) if [ "x$TMPDIR" = "x." ]; then install -m 644 $i docu-module/${i#./} else - install -m 644 $i docu-module/README.`basename "$TMPDIR"` + install -m 644 $i docu-module/README.$(basename "$TMPDIR") fi done # +# forbidden links +pushd %{buildroot}/ + find . -type l -printf '%%P %%l\n' | while read dst src + do + case "$src" in + %{buildroot}/*) + src=${src#%{buildroot}/} + rm -vf $dst + ln -frsv $src $dst + ;; + *) + ;; + esac + done +popd +# # icons install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps install -m 644 icons/* %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps @@ -170,23 +177,20 @@ %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/%{name}.desktop %find_lang fvwm %{name}.lang %find_lang FvwmScript %{name}.lang -%find_lang FvwmTaskBar %{name}.lang %files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS docs sample.fvwmrc docu-module/* +%doc COPYING NEWS docs docu-module/* %dir %{_sysconfdir}/X11/fvwm2 %config %{_sysconfdir}/X11/fvwm2/system.fvwm2rc %{_prefix}/%{_xorg7bin}/* %{_prefix}/%{_xorg7libs32}/X11/fvwm2/* %{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps/* #%{_xorg7prefix}/share/locale/*/*/* -%{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils/quantize_pixmaps %dir %{_xorg7prefix}/lib/X11/fvwm2 %{_xorg7prefix}/share/fvwm %dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2 %dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps -%dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils %{_xorg7mandir}/man1/* %{_datadir}/xsessions/*desktop ++++++ fvwm-2.5.26-ia64.patch ++++++ --- /var/tmp/diff_new_pack.N0dJlg/_old 2017-02-09 11:19:00.566267388 +0100 +++ /var/tmp/diff_new_pack.N0dJlg/_new 2017-02-09 11:19:00.570266822 +0100 @@ -3,8 +3,8 @@ 1 file changed, 4 insertions(+), 4 deletions(-) --- fvwm/stack.c -+++ fvwm/stack.c 2016-08-02 13:46:46.357086943 +0000 -@@ -115,7 +115,7 @@ static void dump_stack_ring(void) ++++ fvwm/stack.c 2017-02-07 10:55:25.816637544 +0000 +@@ -114,7 +114,7 @@ static void dump_stack_ring(void) t1 = t1->stack_next) { fprintf(stderr," l=%d fw=%p f=0x%08x '%s'\n", t1->layer, @@ -13,7 +13,7 @@ } return; -@@ -204,14 +204,14 @@ void verify_stack_ring_consistency(void) +@@ -203,14 +203,14 @@ void verify_stack_ring_consistency(void) fprintf( stderr,"vsrc: window already died:" " fw=%p w=0x%08x '%s'\n", @@ -30,7 +30,7 @@ t1->name.name); dump_stack_ring(); fprintf(stderr,"dumping X stacking order:\n"); -@@ -227,7 +227,7 @@ void verify_stack_ring_consistency(void) +@@ -226,7 +226,7 @@ void verify_stack_ring_consistency(void) { fprintf( stderr, " f=0x%08x\n", ++++++ fvwm-2.5.26-no-copy-dt-needed-entries.patch ++++++ --- /var/tmp/diff_new_pack.N0dJlg/_old 2017-02-09 11:19:00.578265690 +0100 +++ /var/tmp/diff_new_pack.N0dJlg/_new 2017-02-09 11:19:00.578265690 +0100 @@ -4,15 +4,12 @@ fvwm-2.6.6/fvwm/Makefile.am | 3 ++- fvwm-2.6.6/modules/FvwmButtons/Makefile.am | 3 ++- fvwm-2.6.6/modules/FvwmForm/Makefile.am | 3 ++- - fvwm-2.6.6/modules/FvwmIconBox/Makefile.am | 3 ++- fvwm-2.6.6/modules/FvwmIconMan/Makefile.am | 3 ++- fvwm-2.6.6/modules/FvwmIdent/Makefile.am | 3 ++- fvwm-2.6.6/modules/FvwmPager/Makefile.am | 3 ++- fvwm-2.6.6/modules/FvwmProxy/Makefile.am | 3 ++- fvwm-2.6.6/modules/FvwmScript/Makefile.am | 3 ++- - fvwm-2.6.6/modules/FvwmTaskBar/Makefile.am | 3 ++- - fvwm-2.6.6/modules/FvwmWinList/Makefile.am | 3 ++- - 11 files changed, 22 insertions(+), 11 deletions(-) + 8 files changed, 16 insertions(+), 8 deletions(-) --- fvwm-2.6.6/fvwm/Makefile.am +++ fvwm-2.6.6/fvwm/Makefile.am 2016-08-02 14:07:39.789474831 +0000 @@ -50,18 +47,6 @@ AM_CPPFLAGS = -I$(top_srcdir) $(Xft_CFLAGS) $(X_CFLAGS) $(iconv_CFLAGS) \ $(Bidi_CFLAGS) $(Xrender_CFLAGS) ---- fvwm-2.6.6/modules/FvwmIconBox/Makefile.am -+++ fvwm-2.6.6/modules/FvwmIconBox/Makefile.am 2016-08-02 14:07:39.785474903 +0000 -@@ -19,7 +19,8 @@ FvwmIconBox_DEPENDENCIES = $(top_builddi - LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \ - $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) \ - $(iconv_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) $(Bidi_LIBS) \ -- $(png_LIBS) $(rsvg_LIBS) -+ $(png_LIBS) $(rsvg_LIBS) -lfontconfig -+ $(png_LIBS) $(rsvg_LIBS) -lfontconfig - - AM_CPPFLAGS = -I$(top_srcdir) $(Xft_CFLAGS) $(xpm_CFLAGS) $(X_CFLAGS) \ - $(iconv_CFLAGS) $(Xrender_CFLAGS) $(Bidi_CFLAGS) $(png_CFLAGS) --- fvwm-2.6.6/modules/FvwmIconMan/Makefile.am +++ fvwm-2.6.6/modules/FvwmIconMan/Makefile.am 2016-08-02 14:07:39.789474831 +0000 @@ -21,7 +21,8 @@ FvwmIconMan_DEPENDENCIES = $(top_builddi @@ -122,27 +107,3 @@ AM_CPPFLAGS = -I$(top_srcdir) $(xpm_CFLAGS) $(Xft_CFLAGS) $(X_CFLAGS) \ $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS) $(png_CFLAGS) ---- fvwm-2.6.6/modules/FvwmTaskBar/Makefile.am -+++ fvwm-2.6.6/modules/FvwmTaskBar/Makefile.am 2016-08-02 14:07:39.789474831 +0000 -@@ -20,7 +20,8 @@ config_DATA = \ - LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm -lm $(xpm_LIBS) $(png_LIBS) \ - $(rsvg_LIBS) $(Xft_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \ - $(X_EXTRA_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) $(iconv_LIBS) \ -- $(Bidi_LIBS) $(intl_LIBS) -+ $(Bidi_LIBS) $(intl_LIBS) -lfontconfig -+ $(Bidi_LIBS) $(intl_LIBS) -lfontconfig - - AM_CPPFLAGS = -I$(top_srcdir) $(xpm_CFLAGS) $(png_CFLAGS) $(Xft_CFLAGS) \ - $(X_CFLAGS) $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS) \ ---- fvwm-2.6.6/modules/FvwmWinList/Makefile.am -+++ fvwm-2.6.6/modules/FvwmWinList/Makefile.am 2016-08-02 14:07:39.785474903 +0000 -@@ -20,7 +20,8 @@ FvwmWinList_DEPENDENCIES = $(top_builddi - ## so we might as well link against libXpm, if present. - LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) \ - $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) \ -- $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) -+ $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) -lfontconfig -+ $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) -lfontconfig - - AM_CPPFLAGS = -I$(top_srcdir) $(Xft_CFLAGS) $(X_CFLAGS) $(Xrender_CFLAGS) \ - $(iconv_CFLAGS) $(Bidi_CFLAGS) ++++++ fvwm-2.5.26-sv_SE.patch ++++++ --- /var/tmp/diff_new_pack.N0dJlg/_old 2017-02-09 11:19:00.590263993 +0100 +++ /var/tmp/diff_new_pack.N0dJlg/_new 2017-02-09 11:19:00.590263993 +0100 @@ -3,13 +3,13 @@ 1 file changed, 1 insertion(+), 1 deletion(-) --- configure.ac -+++ configure.ac 2016-08-02 13:48:41.090857180 +0000 -@@ -1272,7 +1272,7 @@ AC_ARG_ENABLE(perllib, ++++ configure.ac 2017-02-07 10:59:12.000308716 +0000 +@@ -1253,7 +1253,7 @@ AC_ARG_ENABLE(perllib, AC_SUBST(FVWM_PERLLIB) # ******* gettext -ALL_LINGUAS="ar de fr sv_SE zh_CN ru es" +ALL_LINGUAS="ar de fr sv zh_CN ru es" FVWM_DOMAIN="fvwm" - FVWMTASKBAR_DOMAIN="FvwmTaskBar" FVWMSCRIPT_DOMAIN="FvwmScript" + ALL_DOMAINS="$FVWM_DOMAIN $FVWMTASKBAR_DOMAIN $FVWMSCRIPT_DOMAIN" ++++++ fvwm-2.6.6.tar.bz2 -> fvwm-2.6.7.tar.bz2 ++++++ ++++ 122532 lines of diff (skipped) ++++++ fvwm-configure.patch ++++++ --- /var/tmp/diff_new_pack.N0dJlg/_old 2017-02-09 11:19:02.182038778 +0100 +++ /var/tmp/diff_new_pack.N0dJlg/_new 2017-02-09 11:19:02.182038778 +0100 @@ -1,8 +1,12 @@ Index: configure.ac =================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -111,7 +111,7 @@ AC_ARG_ENABLE(package-subdirs, +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- configure.ac ++++ configure.ac 2017-02-07 10:53:27.290904016 +0000 +@@ -104,7 +104,7 @@ AC_ARG_ENABLE(package-subdirs, fi], []) ++++++ fvwm-no-date-time.patch ++++++ --- /var/tmp/diff_new_pack.N0dJlg/_old 2017-02-09 11:19:02.218033686 +0100 +++ /var/tmp/diff_new_pack.N0dJlg/_new 2017-02-09 11:19:02.222033120 +0100 @@ -1,17 +1,11 @@ ---- fvwm/session.c.orig -+++ fvwm/session.c -@@ -135,7 +135,7 @@ static char *get_version_string(void) - { - /* migo (14-Mar-2001): it is better to manually update a version string - * in the stable branch, otherwise saving sessions becomes useless */ -- return CatString3(VERSION, ", ", __DATE__); -+ return CatString3(VERSION, ", ", "??? ?? ????"); - /* return "2.6-0"; */ - } - ---- fvwm/fvwm.c.orig -+++ fvwm/fvwm.c -@@ -1298,8 +1298,8 @@ static void setVersionInfo(void) +--- + fvwm/fvwm.c | 4 ++-- + fvwm/session.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- fvwm/fvwm.c ++++ fvwm/fvwm.c 2017-02-07 11:11:29.990180773 +0000 +@@ -1295,8 +1295,8 @@ static void setVersionInfo(void) int support_len; /* Set version information string */ @@ -22,3 +16,14 @@ Fvwm_VersionInfo = safestrdup(version_str); sprintf(license_str, +--- fvwm/session.c ++++ fvwm/session.c 2017-02-07 11:11:29.990180773 +0000 +@@ -136,7 +136,7 @@ static char *get_version_string(void) + { + /* migo (14-Mar-2001): it is better to manually update a version string + * in the stable branch, otherwise saving sessions becomes useless */ +- return CatString3(VERSION, ", ", __DATE__); ++ return CatString3(VERSION, ", ", "??? ?? ????"); + /* return "2.6-0"; */ + } + ++++++ fvwm-rsvg.patch ++++++ --- /var/tmp/diff_new_pack.N0dJlg/_old 2017-02-09 11:19:02.238030856 +0100 +++ /var/tmp/diff_new_pack.N0dJlg/_new 2017-02-09 11:19:02.238030856 +0100 @@ -1,12 +1,11 @@ --- configure | 1 - configure.ac | 1 - - libs/Fsvg.h | 11 ----------- - 3 files changed, 13 deletions(-) + 2 files changed, 2 deletions(-) --- configure.ac -+++ configure.ac 2016-08-02 15:14:24.251904702 +0000 -@@ -941,7 +941,6 @@ if test x"$with_rsvg" = xyes ; then ++++ configure.ac 2017-02-07 11:06:58.555365173 +0000 +@@ -922,7 +922,6 @@ if test x"$with_rsvg" = xyes ; then LIBS="$LIBS $rsvg_LIBS" AC_TRY_RUN([ #include <librsvg/rsvg.h> @@ -15,8 +14,8 @@ RsvgHandle *rsvg; g_type_init(); --- configure -+++ configure 2016-08-02 15:14:24.255904627 +0000 -@@ -9746,7 +9746,6 @@ else ++++ configure 2017-02-07 11:06:58.559365097 +0000 +@@ -9939,7 +9939,6 @@ else /* end confdefs.h. */ #include <librsvg/rsvg.h> @@ -24,23 +23,3 @@ int main() { RsvgHandle *rsvg; g_type_init(); ---- libs/Fsvg.h -+++ libs/Fsvg.h 2016-08-02 15:15:16.350925785 +0000 -@@ -15,17 +15,6 @@ - - #if USE_SVG - # include <librsvg/rsvg.h> --/* TA: (2013-05-07): If the version is >= 2.36.2 then we no longer include -- * the rsvg-cairo header. It is now only necessary with RSvg to include -- * <rsvg.h> and nothing else. -- */ --# if defined (LIBRSVG_CHECK_VERSION) --# if LIBRSVG_CHECK_VERSION (2, 36, 1) --# include <librsvg/rsvg-cairo.h> --# endif --# else --# include <librsvg/rsvg-cairo.h> --# endif - typedef RsvgDimensionData FRsvgDimensionData; - typedef RsvgHandle FRsvgHandle; - typedef cairo_surface_t Fcairo_surface_t;