Mailinglist Archive: opensuse-commit (1262 mails)

< Previous Next >
commit glabels
  • From: root@xxxxxxx (h_root)
  • Date: Thu, 7 Sep 2006 01:15:09 +0200 (CEST)
  • Message-id: <20060906231509.3F16918AC10@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package glabels
checked in at Thu Sep 7 01:15:09 CEST 2006.

--------
--- GNOME/glabels/glabels.changes 2006-09-01 19:41:13.000000000 +0200
+++ glabels/glabels.changes 2006-09-05 09:21:48.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 5 09:21:30 CEST 2006 - meissner@xxxxxxx
+
+- use rpm_opt_flags. fixed resulting warnings.
+
+-------------------------------------------------------------------

Old:
----
glabels-2.0.2.patch

New:
----
glabels-2.0.4.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ glabels.spec ++++++
--- /var/tmp/diff_new_pack.2lm6ue/_old 2006-09-07 01:14:41.000000000 +0200
+++ /var/tmp/diff_new_pack.2lm6ue/_new 2006-09-07 01:14:41.000000000 +0200
@@ -18,13 +18,13 @@
Group: Productivity/Office/Other
Autoreqprov: on
Version: 2.0.4
-Release: 1
+Release: 3
Summary: A Label Editing and Printing Tool
Source: glabels-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# For case of splitting of devel subpackage:
#Requires: glib2-devel libxml2-devel glibc-devel zlib-devel
-Patch: %name-2.0.2.patch
+Patch: %name-2.0.4.patch

%description
Labels is a powerful tool for editing and printing all kinds of labels.
@@ -37,10 +37,11 @@
James Willcox <jwillcox@xxxxxxxxxxxxxx>

%prep
-%setup
-#%patch -p1
+%setup -q
+%patch -p1

%build
+CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{prefix} --libdir=/opt/gnome/%{_lib}
make

@@ -88,6 +89,8 @@
%{prefix}/share/mime/subclasses

%changelog -n glabels
+* Tue Sep 05 2006 - meissner@xxxxxxx
+- use rpm_opt_flags. fixed resulting warnings.
* Fri Sep 01 2006 - jhargadon@xxxxxxx
- update to version 2.0.4
- Use filechooser for GnomeFileEntrys in merge properties dialog and

++++++ glabels-2.0.2.patch -> glabels-2.0.4.patch ++++++
--- GNOME/glabels/glabels-2.0.2.patch 2006-01-20 13:03:32.000000000 +0100
+++ glabels/glabels-2.0.4.patch 2006-09-05 09:18:32.000000000 +0200
@@ -1,12 +1,63 @@
-diff -u -r glabels-2.0.2/data/mime/Makefile.in glabels-2.0.2-new/data/mime/Makefile.in
---- glabels-2.0.2/data/mime/Makefile.in 2005-01-20 19:15:05.000000000 +0100
-+++ glabels-2.0.2-new/data/mime/Makefile.in 2006-01-20 12:06:32.000000000 +0100
-@@ -468,7 +468,6 @@
- @INTLTOOL_XML_RULE@
-
- install-data-hook:
--@HAVE_NEW_MIME_TRUE@ $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
- @HAVE_NEWER_MIME_TRUE@ $(UPDATE_DESKTOP_DATABASE)
+--- glabels-2.0.4/src/canvas-hacktext.c.xx 2006-09-05 09:11:07.000000000 +0200
++++ glabels-2.0.4/src/canvas-hacktext.c 2006-09-05 09:11:14.000000000 +0200
+@@ -281,7 +281,6 @@
+ {
+ GnomeCanvasItem *item;
+ glCanvasHacktext *bp;
+- char *text;
+ GnomeGlyphList * gl;
+ GdkColor color;
+ GnomeFont * font;
+@@ -301,7 +300,7 @@
+ bp->priv->glyphlist = NULL;
+ }
+
+- if (text) bp->text = g_value_dup_string (value);
++ if (value) bp->text = g_value_dup_string (value);
+
+ gnome_canvas_item_request_update (item);
+ break;
+--- glabels-2.0.4/src/stock.c.xx 2006-09-05 09:15:29.000000000 +0200
++++ glabels-2.0.4/src/stock.c 2006-09-05 09:15:32.000000000 +0200
+@@ -43,12 +43,12 @@
+ /* Local function prototypes */
+ /*===========================================*/
+
+-static add_icons (GtkIconFactory *factory,
++static void add_icons (GtkIconFactory *factory,
+ const gchar *stock_id,
+ const guchar *inline_24,
+ const guchar *inline_16);
+
+-static add_button_icon (GtkIconFactory *factory,
++static void add_button_icon (GtkIconFactory *factory,
+ const gchar *stock_id,
+ const guchar *inline_24);
+
+@@ -140,7 +140,7 @@
+ /*--------------------------------------------------------------------------*/
+ /* PRIVATE. Unpack and associate given icons with stock_id. */
+ /*--------------------------------------------------------------------------*/
+-static add_icons (GtkIconFactory *factory,
++static void add_icons (GtkIconFactory *factory,
+ const gchar *stock_id,
+ const guchar *inline_24,
+ const guchar *inline_16)
+@@ -180,7 +180,7 @@
+ /*--------------------------------------------------------------------------*/
+ /* PRIVATE. Unpack and associate given button icon with stock_id. */
+ /*--------------------------------------------------------------------------*/
+-static add_button_icon (GtkIconFactory *factory,
++static void add_button_icon (GtkIconFactory *factory,
+ const gchar *stock_id,
+ const guchar *inline_24)
+ {
+--- glabels-2.0.4/src/view-text.c.xx 2006-09-05 09:15:39.000000000 +0200
++++ glabels-2.0.4/src/view-text.c 2006-09-05 09:15:59.000000000 +0200
+@@ -959,5 +959,6 @@
+ glViewObject *view_object)
+ {
+ gl_debug (DEBUG_VIEW, "");
++ return 0; /* right? */
+ }

- uninstall-hook:
-Only in glabels-2.0.2-new/data/mime: Makefile.in~


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread