Mailinglist Archive: opensuse-commit (1855 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package uim for openSUSE:Factory
checked in at Mon Sep 5 17:56:32 CEST 2011.



--------
--- uim/uim.changes     2011-08-08 16:34:02.000000000 +0200
+++ uim/uim.changes     2011-09-05 12:50:05.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Sep  5 10:49:11 UTC 2011 - coolo@xxxxxxxx
+
+- fix build with newer ld
+
+-------------------------------------------------------------------
+Mon Sep  5 10:10:11 UTC 2011 - nlminhtl@xxxxxxxxx
+
+- uim doesn't depend on libgnomeui-devel from 1.7.0. 
+  The dependency was removed in r6932 in the upstream repository
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  fix-libs.patch

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

Other differences:
------------------
++++++ uim.spec ++++++
--- /var/tmp/diff_new_pack.ByRmiv/_old  2011-09-05 17:55:47.000000000 +0200
+++ /var/tmp/diff_new_pack.ByRmiv/_new  2011-09-05 17:55:47.000000000 +0200
@@ -27,7 +27,6 @@
 BuildRequires:  gcc-c++
 BuildRequires:  intltool
 BuildRequires:  libexpat-devel
-BuildRequires:  libgnomeui-devel
 BuildRequires:  libqt4-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  perl-XML-Parser
@@ -50,7 +49,7 @@
 BuildRequires:  fdupes
 %endif
 Version:        1.7.1
-Release:        18
+Release:        20
 # xorg-x11-libXdmcp-devel libgnomeprintui-devel
 License:        GPLv2+
 Summary:        A multilingual input method library
@@ -62,6 +61,7 @@
 Source3:        etc-x11-xim.d-uim
 Source4:        baselibs.conf
 Patch10:        uim-sigscheme-build-fixes.diff
+Patch11:        fix-libs.patch
 PreReq:         %{_bindir}/touch
 Provides:       locale(xorg-x11:ja)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -142,6 +142,7 @@
 %prep
 %setup0 -q
 %patch10 -p1
+%patch11 -p1
 cp emacs/README README.emacs
 iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs
 

++++++ fix-libs.patch ++++++
Index: uim-1.7.1/uim/Makefile.am
===================================================================
--- uim-1.7.1.orig/uim/Makefile.am      2010-05-28 03:53:01.000000000 +0200
+++ uim-1.7.1/uim/Makefile.am   2011-09-05 12:15:49.355126241 +0200
@@ -278,6 +278,7 @@ libuim_custom_enabler_la_CPPFLAGS = -I$(
 
 libuim_counted_init_la_SOURCES = counted-init.c counted-init.h
 libuim_counted_init_la_CPPFLAGS = -I$(top_srcdir)
+libuim_counted_init_la_LIBADD = libuim.la
 
 if LIBUIM_X_UTIL
 libuim_x_util_la_SOURCES = uim-x-util.h uim-x-kana-input-hack.c
Index: uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in
===================================================================
--- uim-1.7.1.orig/qt4/pref/uim-pref-qt4.pro.in 2011-03-27 03:48:08.000000000 
+0200
+++ uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in      2011-09-05 12:33:56.412743578 
+0200
@@ -4,7 +4,7 @@ TEMPLATE = app
 
 # to include qtgettext.h
 INCLUDEPATH += @srcdir@/..
-LIBS += -luim-custom -luim-counted-init @LIBINTL@
+LIBS += -luim-custom -luim-counted-init -luim @LIBINTL@
 
 QMAKE_UIC = $$QMAKE_UIC -tr UIC_
 

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



Remember to have fun...

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