commit libxfce4menu for openSUSE:Factory
Hello community, here is the log from the commit of package libxfce4menu for openSUSE:Factory checked in at Fri Feb 4 09:36:04 CET 2011. -------- --- libxfce4menu/libxfce4menu.changes 2010-12-24 13:23:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/libxfce4menu/libxfce4menu.changes 2011-02-03 19:38:47.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Feb 3 18:31:35 UTC 2011 - gber@opensuse.org + +- added libxfce4menu-4.6.2-add-enum-types.patch in order to + generate enum types + +------------------------------------------------------------------- +Sun Jan 30 22:07:19 UTC 2011 - gber@opensuse.org + +- fixed dependencies of the -devel package +- improved summaries/descriptions + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libxfce4menu-4.6.2-add-enum-types.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxfce4menu.spec ++++++ --- /var/tmp/diff_new_pack.M5SsWr/_old 2011-02-04 09:35:20.000000000 +0100 +++ /var/tmp/diff_new_pack.M5SsWr/_new 2011-02-04 09:35:20.000000000 +0100 @@ -19,17 +19,20 @@ Name: libxfce4menu Version: 4.6.2 -Release: 3 +Release: 4 License: LGPLv2.1+ %define fullname %{name}-0.1 %define libname %{name}-0_1-0 -Summary: Xfce Library implementing the freedesktop.org Desktop Menu Specification +Summary: Xfce Library Implementing the freedesktop.org Desktop Menu Specification Url: http://www.xfce.org/ Group: System/Libraries Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-no-yast-desktop-files.patch +# PATCH-FEATURE-UPSTREAM libxfce4menu-4.6.2-add-enum-types.patch gber@opensuse.org -- Generates enum types (backported from upstream git) +Patch1: libxfce4menu-4.6.2-add-enum-types.patch BuildRequires: gtk-doc BuildRequires: intltool +BuildRequires: xfce4-dev-tools BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libxfce4util-1.0) @@ -41,7 +44,7 @@ %package -n libxfce4menu-0_1-0 License: LGPLv2.1+ -Summary: Xfce4 menu +Summary: Xfce Library Implementing the freedesktop.org Desktop Menu Specification Group: System/Libraries %description -n libxfce4menu-0_1-0 @@ -50,25 +53,28 @@ %package devel License: LGPLv2.1+ -Summary: Xfce4 menu +Summary: Development Files for libxfce4menu Group: Development/Libraries/C and C++ +Requires: pkgconfig(glib-2.0) +Requires: pkgconfig(gtk+-2.0) +Requires: pkgconfig(libxfce4util-1.0) Requires: %{libname} = %{version} %description devel -The libxfce4menu library implements the freedesktop.org Desktop Menu -Specification. It has been superseded by garcon. - -This package contains development files needed to develop applications based on -libxfce4menu. +This package contains the API documentation and development files needed to +develop applications based on libxfce4menu. %prep %setup -q %patch0 +%patch1 -p1 %build +xdt-autogen %configure \ --enable-gtk-doc \ - --disable-static + --disable-static \ + --enable-maintainer-mode make %{?_smp_mflags} %install ++++++ libxfce4menu-4.6.2-add-enum-types.patch ++++++
From 60310e06364f913c0a2bd21b2935689047f175b1 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic
Date: Sun, 02 Jan 2011 20:08:08 +0000 Subject: add enum-types (enum value symbols).
---
diff --git a/libxfce4menu/Makefile.am b/libxfce4menu/Makefile.am
index 2bf778c..61c04f5 100644
--- a/libxfce4menu/Makefile.am
+++ b/libxfce4menu/Makefile.am
@@ -12,7 +12,12 @@ INCLUDES = \
lib_LTLIBRARIES = \
libxfce4menu-0.1.la
+libxfce4menu_enum_headers = \
+ xfce-menu-layout.h \
+ xfce-menu-monitor.h
+
libxfce4menu_headers = \
+ libxfce4menu-enum-types.h \
xfce-menu.h \
xfce-menu-element.h \
xfce-menu-separator.h \
@@ -48,6 +53,10 @@ libxfce4menu_sources = \
xfce-menu-monitor.c \
xfce-menu-item.c
+libxfce4menu_built_sources = \
+ libxfce4menu-enum-types.c \
+ libxfce4menu-enum-types.h
+
libxfce4menuincludedir = $(includedir)/xfce4/libxfce4menu-0.1/libxfce4menu
libxfce4menuinclude_HEADERS = \
@@ -57,7 +66,8 @@ libxfce4menuinclude_HEADERS = \
libxfce4menu_0_1_la_SOURCES = \
$(libxfce4menu_sources) \
- $(libxfce4menu_headers)
+ $(libxfce4menu_headers) \
+ $(libxfce4menu_built_sources)
libxfce4menu_0_1_la_CFLAGS = \
$(GLIB_CFLAGS) \
@@ -90,3 +100,36 @@ pkgconfig_DATA = libxfce4menu-0.1.pc
# required for gtk-doc
dist-hook: all
+
+if MAINTAINER_MODE
+CLEANFILES =
+DISTCLEANFILES = \
+ $(libxfce4menu_built_sources)
+
+BUILT_SOURCES = \
+ $(libxfce4menu_built_sources)
+
+libxfce4menu-enum-types.h: stamp-libxfce4menu-enum-types.h
+ @true
+stamp-libxfce4menu-enum-types.h: $(libxfce4menu_enum_headers) Makefile
+ $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
+ --fhead "#ifndef __LIBXFCE4UI_ENUM_TYPES_H__\n#define __LIBXFCE4UI_ENUM_TYPES_H__\n\nG_BEGIN_DECLS\n\n" \
+ --fprod "/* enumerations from \"@filename@\" */\n\n" \
+ --vhead "GType @enum_name@_get_type(void) G_GNUC_CONST;\n#define XFCE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n\n" \
+ --ftail "G_END_DECLS\n\n#endif /* !__LIBXFCE4UI_ENUM_TYPES_H__ */" \
+ $(libxfce4menu_enum_headers) ) >xgen-leth
+ cmp -s xgen-leth libxfce4menu-enum-types.h || cp xgen-leth libxfce4menu-enum-types.h
+ rm -f xgen-leth
+ echo timestamp > $(@F)
+libxfce4menu-enum-types.c: $(libxfce4menu_enum_headers) Makefile
+ $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
+ --fhead "#include
participants (1)
-
root@hilbert.suse.de