Hello community,
here is the log from the commit of package beaver for openSUSE:Factory
checked in at Wed May 5 23:39:06 CEST 2010.
--------
--- beaver/beaver.changes 2009-12-12 16:27:56.000000000 +0100
+++ beaver/beaver.changes 2010-05-04 16:09:32.000000000 +0200
@@ -1,0 +2,7 @@
+Tue May 4 16:07:50 CEST 2010 - meissner@suse.de
+
+- disable strip --strip-all (to generate debuginfos)
+- fix voidreturn warning
+- add missing ; to desktop file
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
beaver-desktop.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ beaver.spec ++++++
--- /var/tmp/diff_new_pack.9rL8uG/_old 2010-05-05 23:37:57.000000000 +0200
+++ /var/tmp/diff_new_pack.9rL8uG/_new 2010-05-05 23:37:57.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package beaver (Version 0.4.0rc1)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -21,7 +21,7 @@
Name: beaver
Summary: Beaver is an Early AdVanced EditoR. Beaver is based on GTK+2
Version: 0.4.0rc1
-Release: 1
+Release: 2
License: GPLv2
Group: System/GUI/GNOME
Url: http://www.nongnu.org/beaver/index.html
@@ -29,6 +29,7 @@
Patch0: beaver-makefile.patch
Patch1: beaver-no-return.patch
Patch2: beaver-gcc-warns.patch
+Patch3: beaver-desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf automake fdupes gcc gcc-c++ make
BuildRequires: doxygen gtk2-devel pkg-config
@@ -46,13 +47,14 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
./autogen.sh
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
%configure
-%__make %{?jobs:-j%{jobs}}
+%__make V=1 %{?jobs:-j%{jobs}}
%__make doc
%install
++++++ beaver-desktop.patch ++++++
Index: beaver0.4.0/beaver.desktop
===================================================================
--- beaver0.4.0.orig/beaver.desktop
+++ beaver0.4.0/beaver.desktop
@@ -13,7 +13,7 @@ Comment=Beaver's an Early AdVanced Edito
Exec=DESTDIR/bin/beaver %F
Terminal=false
Icon=beaver
-MimeType=text/*
+MimeType=text/*;
StartupNotify=false
#StartupWMClass=beaver
++++++ beaver-makefile.patch ++++++
--- /var/tmp/diff_new_pack.9rL8uG/_old 2010-05-05 23:37:57.000000000 +0200
+++ /var/tmp/diff_new_pack.9rL8uG/_new 2010-05-05 23:37:57.000000000 +0200
@@ -1,7 +1,8 @@
-diff -uNr old-beaver0.4.0//Makefile.am beaver0.4.0//Makefile.am
---- old-beaver0.4.0//Makefile.am 2009-10-01 18:59:20.000000000 +0200
-+++ beaver0.4.0//Makefile.am 2009-10-01 19:01:42.000000000 +0200
-@@ -39,10 +39,10 @@
+Index: beaver0.4.0/Makefile.am
+===================================================================
+--- beaver0.4.0.orig/Makefile.am
++++ beaver0.4.0/Makefile.am
+@@ -39,10 +39,10 @@ clean-local:
install-doc:
if HAS_DOXYGEN
if test -d $(srcdir)/doc/html; then \
@@ -14,7 +15,7 @@
fi \
done \
fi
-@@ -53,20 +53,20 @@
+@@ -53,20 +53,20 @@ install-data-local: install-doc
# plugins/mkmakefile.sh
@@ -45,7 +46,7 @@
if test -d $(srcdir)/pixmaps; then \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
-@@ -82,11 +82,11 @@
+@@ -82,11 +82,11 @@ install-data-local: install-doc
$(INSTALL_DATA) resource/beaver.conf.default $(DESTDIR)$(pkgdatadir)/resource
$(INSTALL_DATA) resource/wordfile.default $(DESTDIR)$(pkgdatadir)/resource
@@ -61,12 +62,39 @@
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/include
$(INSTALL_DATA) plugins/Makefile $(DESTDIR)$(pkgdatadir)/include/Makefile
-@@ -97,7 +97,7 @@
+@@ -97,7 +97,6 @@ install-data-local: install-doc
if DEBUG
@echo ""
else
- $(STRIP) --strip-all $(bindir)/beaver$(EXEEXT)
-+ $(STRIP) --strip-all $(DESTDIR)$(bindir)/beaver$(EXEEXT)
endif
uninstall:
+Index: beaver0.4.0/src/Makefile.am
+===================================================================
+--- beaver0.4.0.orig/src/Makefile.am
++++ beaver0.4.0/src/Makefile.am
+@@ -24,8 +24,7 @@ THE_LAST_VAR__=1
+ #if PRINT_LESS_OUTPUT
+
+ .c.o:
+- @echo " [CC] "$<
+- @$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+
+ .c.obj:
+Index: beaver0.4.0/src/api/Makefile.am
+===================================================================
+--- beaver0.4.0.orig/src/api/Makefile.am
++++ beaver0.4.0/src/api/Makefile.am
+@@ -19,8 +19,7 @@ THE_LAST_VAR__=1
+ #if PRINT_LESS_OUTPUT
+
+ .c.o:
+- @echo " [CC] api/"$<
+- @$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+
+ .c.obj:
++++++ beaver-no-return.patch ++++++
--- /var/tmp/diff_new_pack.9rL8uG/_old 2010-05-05 23:37:57.000000000 +0200
+++ /var/tmp/diff_new_pack.9rL8uG/_new 2010-05-05 23:37:57.000000000 +0200
@@ -1,7 +1,37 @@
-diff -uNr old-beaver0.4.0//src/prefs.c beaver0.4.0//src/prefs.c
---- old-beaver0.4.0//src/prefs.c 2009-08-16 19:04:39.000000000 +0200
-+++ beaver0.4.0//src/prefs.c 2009-10-25 16:39:15.705468435 +0100
-@@ -441,7 +441,7 @@
+Index: beaver0.4.0/src/interface.c
+===================================================================
+--- beaver0.4.0.orig/src/interface.c
++++ beaver0.4.0/src/interface.c
+@@ -1482,7 +1482,7 @@ static gboolean expose_event (GtkWidget
+ /* only draw if the user wants to */
+ if (!MARKER)
+ {
+- return;
++ return FALSE;
+ }
+
+ GdkRectangle visible_rect;
+Index: beaver0.4.0/src/prefs.c
+===================================================================
+--- beaver0.4.0.orig/src/prefs.c
++++ beaver0.4.0/src/prefs.c
+@@ -28,6 +28,7 @@
+ *
+ */
+
++#include