commit wmakerconf for openSUSE:Factory
Hello community,
here is the log from the commit of package wmakerconf for openSUSE:Factory
checked in at 2017-12-06 08:59:50
Comparing /work/SRC/openSUSE:Factory/wmakerconf (Old)
and /work/SRC/openSUSE:Factory/.wmakerconf.new (New)
Package is "wmakerconf"
Wed Dec 6 08:59:50 2017 rev:23 rq:548538 version:2.12
Changes:
--- /work/SRC/openSUSE:Factory/wmakerconf/wmakerconf.changes2017-04-24
09:48:51.579313445 +0200
+++ /work/SRC/openSUSE:Factory/.wmakerconf.new/wmakerconf.changes
2017-12-06 08:59:51.762188016 +0100
@@ -1,0 +2,6 @@
+Mon Dec 4 15:45:08 UTC 2017 - crrodrig...@opensuse.org
+
+- add explicit buildrequires to x11 and glib, do not count
+ on them being pulled by WindowMaker-devel
+
+---
Other differences:
--
++ wmakerconf.spec ++
--- /var/tmp/diff_new_pack.ynDDoa/_old 2017-12-06 08:59:52.574158295 +0100
+++ /var/tmp/diff_new_pack.ynDDoa/_new 2017-12-06 08:59:52.578158149 +0100
@@ -40,9 +40,13 @@
BuildRequires: WindowMaker-devel
BuildRequires: automake
BuildRequires: fdupes
-BuildRequires: gtk2-devel
BuildRequires: perl-libwww-perl
BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(gdk-x11-2.0)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gobject-2.0)
+BuildRequires: pkgconfig(gtk+-x11-2.0)
+BuildRequires: pkgconfig(x11)
Provides: wmaconf = %{version}
Obsoletes: wmaconf < %{version}
Requires: WindowMaker
commit wmakerconf for openSUSE:Factory
Hello community,
here is the log from the commit of package wmakerconf for openSUSE:Factory
checked in at 2017-04-24 09:48:48
Comparing /work/SRC/openSUSE:Factory/wmakerconf (Old)
and /work/SRC/openSUSE:Factory/.wmakerconf.new (New)
Package is "wmakerconf"
Mon Apr 24 09:48:48 2017 rev:22 rq:489274 version:2.12
Changes:
--- /work/SRC/openSUSE:Factory/wmakerconf/wmakerconf.changes2017-04-11
09:40:09.11407 +0200
+++ /work/SRC/openSUSE:Factory/.wmakerconf.new/wmakerconf.changes
2017-04-24 09:48:51.579313445 +0200
@@ -1,0 +2,6 @@
+Fri Apr 7 20:52:06 UTC 2017 - jeng...@inai.de
+
+- Replace old %makeinstall by %make_install. Remove redundnat
+ %clean section.
+
+---
Other differences:
--
++ wmakerconf.spec ++
--- /var/tmp/diff_new_pack.C5fBH2/_old 2017-04-24 09:48:52.447190696 +0200
+++ /var/tmp/diff_new_pack.C5fBH2/_new 2017-04-24 09:48:52.451190131 +0200
@@ -80,7 +80,7 @@
# ---
%install
-%makeinstall
+%make_install
# Change no to nb
mv %{buildroot}%{_datadir}/locale/no %{buildroot}%{_datadir}/locale/nb
%find_lang %{name}
@@ -93,9 +93,6 @@
done
%fdupes -s %{buildroot}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files -f %{name}.lang
%defattr(-,root,root)
%doc ABOUT-NLS AUTHORS COPYING ChangeLog MANUAL NEWS NLS-TEAM1 README TODO
commit wmakerconf for openSUSE:Factory
Hello community,
here is the log from the commit of package wmakerconf for openSUSE:Factory
checked in at 2017-04-11 09:40:06
Comparing /work/SRC/openSUSE:Factory/wmakerconf (Old)
and /work/SRC/openSUSE:Factory/.wmakerconf.new (New)
Package is "wmakerconf"
Tue Apr 11 09:40:06 2017 rev:21 rq:484764 version:2.12
Changes:
--- /work/SRC/openSUSE:Factory/wmakerconf/wmakerconf.changes2016-05-08
10:45:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.wmakerconf.new/wmakerconf.changes
2017-04-11 09:40:09.11407 +0200
@@ -1,0 +2,7 @@
+Wed Mar 15 00:03:13 UTC 2017 - ch...@computersalat.de
+
+- fix build
+ * add correct LDFLAGS for x86_64
+- some rpmlint stuff
+
+---
Other differences:
--
++ wmakerconf.spec ++
--- /var/tmp/diff_new_pack.pIamow/_old 2017-04-11 09:40:10.243396084 +0200
+++ /var/tmp/diff_new_pack.pIamow/_new 2017-04-11 09:40:10.243396084 +0200
@@ -1,7 +1,7 @@
#
# spec file for package wmakerconf
#
-# 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
@@ -43,8 +43,8 @@
BuildRequires: gtk2-devel
BuildRequires: perl-libwww-perl
BuildRequires: update-desktop-files
-Obsoletes: wmaconf
-Provides: wmaconf
+Provides: wmaconf = %{version}
+Obsoletes: wmaconf < %{version}
Requires: WindowMaker
Requires: perl-libwww-perl
@@ -70,6 +70,9 @@
mv ChangeLog~ ChangeLog # drop changelog entries from gettextize to fix
build-compare
autoreconf --install --force
test -f po/Makevars || mv po/Makevars.template po/Makevars
+%ifarch x86_64
+export LDFLAGS="$LDFLAGS -L%{_libdir} -L/usr/X11/lib64 -L/usr/X11R6/lib64"
+%endif
%configure \
--with-nlsdir=%{_datadir}/locale \
--with-pixmapdir=%{_datadir}/WindowMaker/Pixmaps
@@ -83,7 +86,12 @@
%find_lang %{name}
%find_lang wmakerconf-data %{name}.lang
%suse_update_desktop_file wmakerconf
-%fdupes %{buildroot}
+
+# remove doc files from datadir
+for i in ABOUT-NLS AUTHORS COPYING ChangeLog MANUAL NEWS NLS-TEAM1 README ; do
+ rm -f %{buildroot}%{_datadir}/%{name}/$i
+done
+%fdupes -s %{buildroot}
%clean
rm -rf $RPM_BUILD_ROOT
commit wmakerconf for openSUSE:Factory
Hello community,
here is the log from the commit of package wmakerconf for openSUSE:Factory
checked in at 2016-05-08 10:45:14
Comparing /work/SRC/openSUSE:Factory/wmakerconf (Old)
and /work/SRC/openSUSE:Factory/.wmakerconf.new (New)
Package is "wmakerconf"
Changes:
--- /work/SRC/openSUSE:Factory/wmakerconf/wmakerconf.changes2016-03-18
21:42:34.0 +0100
+++ /work/SRC/openSUSE:Factory/.wmakerconf.new/wmakerconf.changes
2016-05-08 10:45:25.0 +0200
@@ -1,0 +2,6 @@
+Mon Apr 18 09:56:25 UTC 2016 - dims...@opensuse.org
+
+- Add wmakerconf-link-x11.patch: link mkpreview with libX11 for
+ XOpenDisplay.
+
+---
New:
wmakerconf-link-x11.patch
Other differences:
--
++ wmakerconf.spec ++
--- /var/tmp/diff_new_pack.pBt9JN/_old 2016-05-08 10:45:26.0 +0200
+++ /var/tmp/diff_new_pack.pBt9JN/_new 2016-05-08 10:45:26.0 +0200
@@ -34,6 +34,8 @@
Patch10:%{name}-2.12-wmaker-0.95_support.patch
# PATCH - Fix SUSE: implicit-pointer-decl
Patch11:%{name}-implicit-pointer-decl.patch
+# PATCH-FIX-UPSTREAM wmakerconf-link-x11.patch dims...@opesuse.org -- Link
mkpreview with libX11 for XOpenDisplay
+Patch12:%{name}-link-x11.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: WindowMaker-devel
BuildRequires: automake
@@ -60,6 +62,7 @@
%patch9
%patch10
%patch11
+%patch12 -p1
# ---
%build
++ wmakerconf-link-x11.patch ++
Index: wmakerconf-2.12/configure.ac
===
--- wmakerconf-2.12.orig/configure.ac
+++ wmakerconf-2.12/configure.ac
@@ -292,6 +292,9 @@ AC_SUBST(DATADIR)
WWWGET=$wwwget
AC_SUBST(WWWGET)
+# mkpreview requries X11 symbols XOpenDisplay
+PKG_CHECK_MODULES(X11, x11)
+
if test -n "$www_support"; then
AC_DEFINE(WWWREQUEST, 1, [Define if you want to use WWW requests])
fi
Index: wmakerconf-2.12/src/Makefile.am
===
--- wmakerconf-2.12.orig/src/Makefile.am
+++ wmakerconf-2.12/src/Makefile.am
@@ -11,12 +11,12 @@
bin_PROGRAMS = wmakerconf @MKPREVIEW@
EXTRA_PROGRAMS = mkpreview
-wmakerconf_LDADD = $(GDK_IMLIB_LIBS) @INTLLIBS@ @WRASTERLIBS@ @WMFUNLIBS@
+wmakerconf_LDADD = $(GDK_IMLIB_LIBS) $(X11_LIBS) @INTLLIBS@
@WRASTERLIBS@ @WMFUNLIBS@
wmakerconf_SOURCES = dialog.c dndtree.c error.c icons.c keys.c load.c \
menu.c misc.c path.c previews.c rimage.c rootmenu.c \
shortcuts.c simple.c texture.c themebrowser.c \
window.c wmconfig.c
-mkpreview_LDADD= @WRASTERLIBS@
+mkpreview_LDADD= $(X11_LIBS) @WRASTERLIBS@
noinst_HEADERS = dndtree.h misc.h menu.h error.h window.h icons.h \
dialog.h path.h rootmenu.h shortcuts.h simple.h \
commit wmakerconf for openSUSE:Factory
Hello community, here is the log from the commit of package wmakerconf for openSUSE:Factory checked in at 2016-03-18 21:42:33 Comparing /work/SRC/openSUSE:Factory/wmakerconf (Old) and /work/SRC/openSUSE:Factory/.wmakerconf.new (New) Package is "wmakerconf" Changes: --- /work/SRC/openSUSE:Factory/wmakerconf/wmakerconf.changes2012-05-08 12:29:19.0 +0200 +++ /work/SRC/openSUSE:Factory/.wmakerconf.new/wmakerconf.changes 2016-03-18 21:42:34.0 +0100 @@ -1,0 +2,5 @@ +Thu Mar 17 09:25:13 UTC 2016 - bwiedem...@suse.com + +- drop changelog entries from gettextize to fix build-compare + +--- Other differences: -- ++ wmakerconf.spec ++ --- /var/tmp/diff_new_pack.9J9exJ/_old 2016-03-18 21:42:35.0 +0100 +++ /var/tmp/diff_new_pack.9J9exJ/_new 2016-03-18 21:42:35.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package wmakerconf # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -64,6 +64,7 @@ %build gettextize -f +mv ChangeLog~ ChangeLog # drop changelog entries from gettextize to fix build-compare autoreconf --install --force test -f po/Makevars || mv po/Makevars.template po/Makevars %configure \
commit wmakerconf for openSUSE:Factory
Hello community,
here is the log from the commit of package wmakerconf for openSUSE:Factory
checked in at 2012-05-08 12:29:18
Comparing /work/SRC/openSUSE:Factory/wmakerconf (Old)
and /work/SRC/openSUSE:Factory/.wmakerconf.new (New)
Package is wmakerconf, Maintainer is mhruse...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/wmakerconf/wmakerconf.changes2011-12-26
16:30:01.0 +0100
+++ /work/SRC/openSUSE:Factory/.wmakerconf.new/wmakerconf.changes
2012-05-08 12:29:19.0 +0200
@@ -1,0 +2,11 @@
+Fri Apr 27 21:16:30 UTC 2012 - ch...@computersalat.de
+
+- fix for sf#3488712 (fix build for new wmaker-0.95)
+ * add wmakerconf-2.12-wmaker-0.95_support.patch
+- try to fix implicit-pointer-decl
+ * add implicit-pointer-decl patch
+- rebase patches to be p0
+- some spec cleanup
+- enable parallel build
+
+---
New:
wmakerconf-2.12-wmaker-0.95_support.patch
wmakerconf-implicit-pointer-decl.patch
Other differences:
--
++ wmakerconf.spec ++
--- /var/tmp/diff_new_pack.H7MU7p/_old 2012-05-08 12:29:21.0 +0200
+++ /var/tmp/diff_new_pack.H7MU7p/_new 2012-05-08 12:29:21.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package wmakerconf
#
-# 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
@@ -17,6 +17,24 @@
Name: wmakerconf
+Summary:Configuration tool for Window Maker
+License:GPL-2.0+
+Group: System/GUI/Other
+Version:2.12
+Release:0
+Url:http://wmakerconf.sourceforge.net/
+Source: %{name}-%{version}.tar.bz2
+Patch0: %{name}-2.9.dif
+Patch1: %{name}-fix-bad-po.patch
+Patch3: %{name}-2.9-destdir.patch
+Patch4: %{name}-2.9-config.patch
+Patch5: %{name}-no-imlib.patch
+Patch7: %{name}-2.9-varargs.diff
+Patch9: %{name}-datarootdir.patch
+Patch10:%{name}-2.12-wmaker-0.95_support.patch
+# PATCH - Fix SUSE: implicit-pointer-decl
+Patch11:%{name}-implicit-pointer-decl.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: WindowMaker-devel
BuildRequires: automake
BuildRequires: fdupes
@@ -27,40 +45,21 @@
Provides: wmaconf
Requires: WindowMaker
Requires: perl-libwww-perl
-Summary:Configuration tool for Window Maker
-License:GPL-2.0+
-Group: System/GUI/Other
-Version:2.12
-Release:0
-Url:http://wmakerconf.sourceforge.net/
-Source: %{name}-%{version}.tar.bz2
-Patch: wmakerconf-2.9.dif
-Patch1: wmakerconf-fix-bad-po.patch
-Patch3: wmakerconf-2.9-destdir.patch
-Patch4: wmakerconf-2.9-config.patch
-Patch5: wmakerconf-no-imlib.patch
-Patch7: wmakerconf-2.9-varargs.diff
-Patch9: wmakerconf-datarootdir.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Wmakerconf is a GTK+ based configuration tool for Window Maker.
-
-
-Authors:
-
-Ullrich Hafner haf...@bigfoot.de
-
%prep
%setup -q
-%patch
-%patch1 -p1
+%patch0
+%patch1
%patch3
%patch4
-%patch5 -p1
+%patch5
%patch7
%patch9
+%patch10
+%patch11
# ---
%build
@@ -70,7 +69,7 @@
%configure \
--with-nlsdir=%{_datadir}/locale \
--with-pixmapdir=%{_datadir}/WindowMaker/Pixmaps
-make
+make %{?_smp_mflags}
# ---
%install
++ wmakerconf-2.12-wmaker-0.95_support.patch ++
Index: src/menu.c
===
--- src/menu.c.orig
+++ src/menu.c
@@ -500,10 +500,10 @@ revert_and_exit (GtkWidget *w, gpointer
* No return value.
*/
{
- if (!WMWritePropListToFile (orig_wmaker, orig_wmaker_fname, YES))
+ if (!WMWritePropListToFile(orig_wmaker, orig_wmaker_fname))
warning (_(Can't revert to backupfile of `WindowMaker'.
Please manually revert from file WindowMaker.bak.));
- if (orig_rootmenu !WMWritePropListToFile (orig_rootmenu,
orig_rootmenu_fname, YES))
+ if (orig_rootmenu !WMWritePropListToFile(orig_rootmenu,
orig_rootmenu_fname))
warning (_(Can't revert to backupfile of `WMRootMenu'.
Please manually revert from file WMRootMenu.bak.));
gtk_main_quit ();
Index: src/rootmenu.c
===
---
commit wmakerconf for openSUSE:Factory
Hello community,
here is the log from the commit of package wmakerconf for openSUSE:Factory
checked in at 2011-12-26 16:29:55
Comparing /work/SRC/openSUSE:Factory/wmakerconf (Old)
and /work/SRC/openSUSE:Factory/.wmakerconf.new (New)
Package is wmakerconf, Maintainer is mhruse...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/wmakerconf/wmakerconf.changes2011-09-23
12:50:42.0 +0200
+++ /work/SRC/openSUSE:Factory/.wmakerconf.new/wmakerconf.changes
2011-12-26 16:30:01.0 +0100
@@ -1,0 +2,10 @@
+Wed Dec 21 10:31:52 UTC 2011 - co...@suse.com
+
+- remove call to suse_update_config (very old work around)
+
+---
+Thu Dec 1 16:06:10 UTC 2011 - co...@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
+---
Other differences:
--
++ wmakerconf.spec ++
--- /var/tmp/diff_new_pack.h2vO5E/_old 2011-12-26 16:30:02.0 +0100
+++ /var/tmp/diff_new_pack.h2vO5E/_new 2011-12-26 16:30:02.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package wmakerconf (Version 2.12)
+# spec file for package wmakerconf
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -15,21 +15,23 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: wmakerconf
-BuildRequires: WindowMaker-devel fdupes gtk2-devel perl-libwww-perl
update-desktop-files
-License:GPLv2+
-Group: System/GUI/Other
+BuildRequires: WindowMaker-devel
+BuildRequires: automake
+BuildRequires: fdupes
+BuildRequires: gtk2-devel
+BuildRequires: perl-libwww-perl
+BuildRequires: update-desktop-files
Obsoletes: wmaconf
Provides: wmaconf
Requires: WindowMaker
Requires: perl-libwww-perl
-AutoReqProv:on
Summary:Configuration tool for Window Maker
+License:GPL-2.0+
+Group: System/GUI/Other
Version:2.12
-Release:1
+Release:0
Url:http://wmakerconf.sourceforge.net/
Source: %{name}-%{version}.tar.bz2
Patch: wmakerconf-2.9.dif
@@ -60,7 +62,6 @@
%patch7
%patch9
# ---
-%{suse_update_config -f data}
%build
gettextize -f
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
