pool/ibus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 108396 from M17N

Browse Source 
Update to 1.4.1
Fix several RPMLINT report warnings
Fix FSF-address warnings in RPMLINT report

OBS-URL: https://build.opensuse.org/request/show/108396
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ibus?expand=0&rev=22
This commit is contained in:
Stephan Kulow 2012-03-08 18:43:48 +00:00 committed by Git OBS Bridge
commit df72c555bd
6 changed files with 766 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ibus-1.4.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9e5a17d910eae932dd0cd185d0a102b56ad4a2bf79d54b1e53f70174cd2c2a3f
size 1452055

3
ibus-1.4.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3f04d9d12b251d119a180d6
size 1479412

730
ibus-fsf-address.patch Normal file
View File

@ -0,0 +1,730 @@
diff -Nur ibus-1.4.1/ibus/application.py ibus-1.4.1-new/ibus/application.py
--- ibus-1.4.1/ibus/application.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/application.py 2012-03-07 21:31:18.545914384 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import ibus
import dbus
diff -Nur ibus-1.4.1/ibus/attribute.py ibus-1.4.1-new/ibus/attribute.py
--- ibus-1.4.1/ibus/attribute.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/attribute.py 2012-03-07 21:31:32.042913901 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"ATTR_TYPE_UNDERLINE",
diff -Nur ibus-1.4.1/ibus/bus.py ibus-1.4.1-new/ibus/bus.py
--- ibus-1.4.1/ibus/bus.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/bus.py 2012-03-07 21:31:37.376913711 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"Bus",
diff -Nur ibus-1.4.1/ibus/common.py ibus-1.4.1-new/ibus/common.py
--- ibus-1.4.1/ibus/common.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/common.py 2012-03-07 21:31:42.353913533 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"IBUS_IFACE_IBUS",
diff -Nur ibus-1.4.1/ibus/component.py ibus-1.4.1-new/ibus/component.py
--- ibus-1.4.1/ibus/component.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/component.py 2012-03-07 21:31:48.086913328 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"Component",
diff -Nur ibus-1.4.1/ibus/config.py ibus-1.4.1-new/ibus/config.py
--- ibus-1.4.1/ibus/config.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/config.py 2012-03-07 21:31:53.032913150 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"ConfigBase",
diff -Nur ibus-1.4.1/ibus/_config.py.in ibus-1.4.1-new/ibus/_config.py.in
--- ibus-1.4.1/ibus/_config.py.in 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/_config.py.in 2012-03-07 21:32:00.801912873 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"get_version",
diff -Nur ibus-1.4.1/ibus/enginedesc.py ibus-1.4.1-new/ibus/enginedesc.py
--- ibus-1.4.1/ibus/enginedesc.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/enginedesc.py 2012-03-07 21:32:13.455912421 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"EngineDesc",
diff -Nur ibus-1.4.1/ibus/engine.py ibus-1.4.1-new/ibus/engine.py
--- ibus-1.4.1/ibus/engine.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/engine.py 2012-03-07 21:32:06.504912668 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"EngineBase",
diff -Nur ibus-1.4.1/ibus/exception.py ibus-1.4.1-new/ibus/exception.py
--- ibus-1.4.1/ibus/exception.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/exception.py 2012-03-07 21:32:19.520912202 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = ("IBusException", )
diff -Nur ibus-1.4.1/ibus/factory.py ibus-1.4.1-new/ibus/factory.py
--- ibus-1.4.1/ibus/factory.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/factory.py 2012-03-07 21:32:27.277911925 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"EngineFactoryBase",
diff -Nur ibus-1.4.1/ibus/_gtk.py ibus-1.4.1-new/ibus/_gtk.py
--- ibus-1.4.1/ibus/_gtk.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/_gtk.py 2012-03-07 21:32:32.459911742 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"PangoAttrList",
diff -Nur ibus-1.4.1/ibus/__init__.py ibus-1.4.1-new/ibus/__init__.py
--- ibus-1.4.1/ibus/__init__.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/__init__.py 2012-03-07 21:32:37.312911567 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
from object import *
from attribute import *
diff -Nur ibus-1.4.1/ibus/inputcontext.py ibus-1.4.1-new/ibus/inputcontext.py
--- ibus-1.4.1/ibus/inputcontext.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/inputcontext.py 2012-03-07 21:32:42.492911380 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"InputContext",
diff -Nur ibus-1.4.1/ibus/interface/iconfig.py ibus-1.4.1-new/ibus/interface/iconfig.py
--- ibus-1.4.1/ibus/interface/iconfig.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/interface/iconfig.py 2012-03-07 22:02:44.623846933 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = ("IConfig", )
diff -Nur ibus-1.4.1/ibus/interface/ienginefactory.py ibus-1.4.1-new/ibus/interface/ienginefactory.py
--- ibus-1.4.1/ibus/interface/ienginefactory.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/interface/ienginefactory.py 2012-03-07 22:02:54.192846591 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = ("IEngineFactory", )
diff -Nur ibus-1.4.1/ibus/interface/iengine.py ibus-1.4.1-new/ibus/interface/iengine.py
--- ibus-1.4.1/ibus/interface/iengine.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/interface/iengine.py 2012-03-07 22:02:49.694846752 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = ("IEngine", )
diff -Nur ibus-1.4.1/ibus/interface/iibus.py ibus-1.4.1-new/ibus/interface/iibus.py
--- ibus-1.4.1/ibus/interface/iibus.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/interface/iibus.py 2012-03-07 22:02:59.183846411 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = ("IIBus", )
diff -Nur ibus-1.4.1/ibus/interface/iinputcontext.py ibus-1.4.1-new/ibus/interface/iinputcontext.py
--- ibus-1.4.1/ibus/interface/iinputcontext.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/interface/iinputcontext.py 2012-03-07 22:03:04.454846224 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = ("IInputContext", )
diff -Nur ibus-1.4.1/ibus/interface/__init__.py ibus-1.4.1-new/ibus/interface/__init__.py
--- ibus-1.4.1/ibus/interface/__init__.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/interface/__init__.py 2012-03-07 22:03:09.294846051 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
from iibus import *
from iinputcontext import *
diff -Nur ibus-1.4.1/ibus/interface/inotifications.py ibus-1.4.1-new/ibus/interface/inotifications.py
--- ibus-1.4.1/ibus/interface/inotifications.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/interface/inotifications.py 2012-03-07 22:03:14.333845870 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = ("INotifications", )
diff -Nur ibus-1.4.1/ibus/interface/ipanel.py ibus-1.4.1-new/ibus/interface/ipanel.py
--- ibus-1.4.1/ibus/interface/ipanel.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/interface/ipanel.py 2012-03-07 22:03:21.290845618 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = ("IPanel", )
diff -Nur ibus-1.4.1/ibus/keysyms.py ibus-1.4.1-new/ibus/keysyms.py
--- ibus-1.4.1/ibus/keysyms.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/keysyms.py 2012-03-07 21:32:52.875911010 +0800
@@ -16,8 +16,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
VoidSymbol = 0xFFFFFF
BackSpace = 0xFF08
diff -Nur ibus-1.4.1/ibus/lang.py ibus-1.4.1-new/ibus/lang.py
--- ibus-1.4.1/ibus/lang.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/lang.py 2012-03-07 21:33:04.912910580 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"get_language_name",
diff -Nur ibus-1.4.1/ibus/lookuptable.py ibus-1.4.1-new/ibus/lookuptable.py
--- ibus-1.4.1/ibus/lookuptable.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/lookuptable.py 2012-03-07 21:33:11.675910339 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"LookupTable",
diff -Nur ibus-1.4.1/ibus/Makefile.am ibus-1.4.1-new/ibus/Makefile.am
--- ibus-1.4.1/ibus/Makefile.am 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/Makefile.am 2012-03-07 21:33:29.143909712 +0800
@@ -17,8 +17,8 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
SUBDIRS = \
interface \
$(NULL)
diff -Nur ibus-1.4.1/ibus/modifier.py ibus-1.4.1-new/ibus/modifier.py
--- ibus-1.4.1/ibus/modifier.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/modifier.py 2012-03-07 21:33:20.712910015 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
SHIFT_MASK = 1 << 0
LOCK_MASK = 1 << 1
diff -Nur ibus-1.4.1/ibus/notifications.py ibus-1.4.1-new/ibus/notifications.py
--- ibus-1.4.1/ibus/notifications.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/notifications.py 2012-03-07 21:33:43.223909210 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"NotificationsBase",
diff -Nur ibus-1.4.1/ibus/object.py ibus-1.4.1-new/ibus/object.py
--- ibus-1.4.1/ibus/object.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/object.py 2012-03-07 21:33:51.445908915 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"Object",
diff -Nur ibus-1.4.1/ibus/observedpath.py ibus-1.4.1-new/ibus/observedpath.py
--- ibus-1.4.1/ibus/observedpath.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/observedpath.py 2012-03-07 21:34:32.255907454 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"ObservedPath",
diff -Nur ibus-1.4.1/ibus/panel.py ibus-1.4.1-new/ibus/panel.py
--- ibus-1.4.1/ibus/panel.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/panel.py 2012-03-07 21:34:37.176907281 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"PanelBase",
diff -Nur ibus-1.4.1/ibus/property.py ibus-1.4.1-new/ibus/property.py
--- ibus-1.4.1/ibus/property.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/property.py 2012-03-07 21:34:43.563907052 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"PROP_TYPE_NORMAL",
diff -Nur ibus-1.4.1/ibus/serializable.py ibus-1.4.1-new/ibus/serializable.py
--- ibus-1.4.1/ibus/serializable.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/serializable.py 2012-03-07 21:34:51.958906751 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"Serializable",
diff -Nur ibus-1.4.1/ibus/text.py ibus-1.4.1-new/ibus/text.py
--- ibus-1.4.1/ibus/text.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/text.py 2012-03-07 21:34:58.122906531 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"Text",
diff -Nur ibus-1.4.1/ibus/utility.py ibus-1.4.1-new/ibus/utility.py
--- ibus-1.4.1/ibus/utility.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ibus/utility.py 2012-03-07 21:35:05.744906259 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"unichar_half_to_full",
diff -Nur ibus-1.4.1/setup/engineabout.py ibus-1.4.1-new/setup/engineabout.py
--- ibus-1.4.1/setup/engineabout.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/setup/engineabout.py 2012-03-07 21:29:41.973917838 +0800
@@ -17,8 +17,8 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
import gtk
from gtk import gdk
diff -Nur ibus-1.4.1/setup/enginecombobox.py ibus-1.4.1-new/setup/enginecombobox.py
--- ibus-1.4.1/setup/enginecombobox.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/setup/enginecombobox.py 2012-03-07 21:30:02.152917116 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import gtk
import gobject
diff -Nur ibus-1.4.1/setup/enginetreeview.py ibus-1.4.1-new/setup/enginetreeview.py
--- ibus-1.4.1/setup/enginetreeview.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/setup/enginetreeview.py 2012-03-07 21:30:12.745916738 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import gtk
import glib
diff -Nur ibus-1.4.1/setup/i18n.py ibus-1.4.1-new/setup/i18n.py
--- ibus-1.4.1/setup/i18n.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/setup/i18n.py 2012-03-07 21:30:21.302916432 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import gettext
import os
diff -Nur ibus-1.4.1/setup/ibus-setup.in ibus-1.4.1-new/setup/ibus-setup.in
--- ibus-1.4.1/setup/ibus-setup.in 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/setup/ibus-setup.in 2012-03-07 21:30:33.800915985 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
prefix=@prefix@
exec_prefix=@exec_prefix@
diff -Nur ibus-1.4.1/setup/icon.py ibus-1.4.1-new/setup/icon.py
--- ibus-1.4.1/setup/icon.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/setup/icon.py 2012-03-07 21:30:39.382915786 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"load_icon"
diff -Nur ibus-1.4.1/setup/keyboardshortcut.py ibus-1.4.1-new/setup/keyboardshortcut.py
--- ibus-1.4.1/setup/keyboardshortcut.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/setup/keyboardshortcut.py 2012-03-07 21:30:45.812915555 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
__all__ = (
"KeyboardShortcutSelection",
diff -Nur ibus-1.4.1/setup/main.py ibus-1.4.1-new/setup/main.py
--- ibus-1.4.1/setup/main.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/setup/main.py 2012-03-07 21:30:53.826915268 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import gettext
import os
diff -Nur ibus-1.4.1/ui/gtk/candidatepanel.py ibus-1.4.1-new/ui/gtk/candidatepanel.py
--- ibus-1.4.1/ui/gtk/candidatepanel.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ui/gtk/candidatepanel.py 2012-03-07 22:00:37.408851483 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import operator
import gtk
diff -Nur ibus-1.4.1/ui/gtk/engineabout.py ibus-1.4.1-new/ui/gtk/engineabout.py
--- ibus-1.4.1/ui/gtk/engineabout.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ui/gtk/engineabout.py 2012-03-07 22:00:36.253851524 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import gtk
from gtk import gdk
diff -Nur ibus-1.4.1/ui/gtk/handle.py ibus-1.4.1-new/ui/gtk/handle.py
--- ibus-1.4.1/ui/gtk/handle.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ui/gtk/handle.py 2012-03-07 22:00:44.073851242 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import gtk
import gtk.gdk as gdk
diff -Nur ibus-1.4.1/ui/gtk/i18n.py ibus-1.4.1-new/ui/gtk/i18n.py
--- ibus-1.4.1/ui/gtk/i18n.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ui/gtk/i18n.py 2012-03-07 22:00:50.831851002 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import gettext
import os
diff -Nur ibus-1.4.1/ui/gtk/ibus-ui-gtk.in ibus-1.4.1-new/ui/gtk/ibus-ui-gtk.in
--- ibus-1.4.1/ui/gtk/ibus-ui-gtk.in 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ui/gtk/ibus-ui-gtk.in 2012-03-07 22:32:20.372783426 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
prefix=@prefix@
exec_prefix=@exec_prefix@
diff -Nur ibus-1.4.1/ui/gtk/icon.py ibus-1.4.1-new/ui/gtk/icon.py
--- ibus-1.4.1/ui/gtk/icon.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ui/gtk/icon.py 2012-03-07 22:00:56.982850782 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import gtk
import gtk.gdk as gdk
diff -Nur ibus-1.4.1/ui/gtk/languagebar.py ibus-1.4.1-new/ui/gtk/languagebar.py
--- ibus-1.4.1/ui/gtk/languagebar.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ui/gtk/languagebar.py 2012-03-07 22:01:01.812850610 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import gtk
import gtk.gdk as gdk
diff -Nur ibus-1.4.1/ui/gtk/main.py ibus-1.4.1-new/ui/gtk/main.py
--- ibus-1.4.1/ui/gtk/main.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ui/gtk/main.py 2012-03-07 22:01:08.263850379 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
# try Cython
# try:
diff -Nur ibus-1.4.1/ui/gtk/menu.py ibus-1.4.1-new/ui/gtk/menu.py
--- ibus-1.4.1/ui/gtk/menu.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ui/gtk/menu.py 2012-03-07 22:01:14.020850171 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import gtk
import gobject
diff -Nur ibus-1.4.1/ui/gtk/notifications.py ibus-1.4.1-new/ui/gtk/notifications.py
--- ibus-1.4.1/ui/gtk/notifications.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ui/gtk/notifications.py 2012-03-07 22:01:18.734850005 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import gtk
import gtk.gdk as gdk
diff -Nur ibus-1.4.1/ui/gtk/panel.py ibus-1.4.1-new/ui/gtk/panel.py
--- ibus-1.4.1/ui/gtk/panel.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ui/gtk/panel.py 2012-03-07 22:01:24.992849778 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import gtk
import gtk.gdk as gdk
diff -Nur ibus-1.4.1/ui/gtk/propitem.py ibus-1.4.1-new/ui/gtk/propitem.py
--- ibus-1.4.1/ui/gtk/propitem.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ui/gtk/propitem.py 2012-03-07 22:01:29.895849605 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
class PropItem:
def __init__(self, prop):
diff -Nur ibus-1.4.1/ui/gtk/toolitem.py ibus-1.4.1-new/ui/gtk/toolitem.py
--- ibus-1.4.1/ui/gtk/toolitem.py 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/ui/gtk/toolitem.py 2012-03-07 22:01:34.815849427 +0800
@@ -17,8 +17,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
import gtk
import gtk.gdk as gdk

12
ibus-src-Makefile.am.diff Normal file
View File

@ -0,0 +1,12 @@
diff -Nur ibus-1.4.1/src/Makefile.am ibus-1.4.1-new/src/Makefile.am
--- ibus-1.4.1/src/Makefile.am 2012-02-02 12:54:54.000000000 +0800
+++ ibus-1.4.1-new/src/Makefile.am 2012-03-07 17:30:53.227329124 +0800
@@ -170,7 +170,7 @@
ibusenumtypes.h \
$(NULL)
IBus-1.0.gir: $(libibus) Makefile
-IBus_1_0_gir_SCANNERFLAGS = --pkg=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS)
+IBus_1_0_gir_SCANNERFLAGS = --pkg-export=ibus-1.0
IBus_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0
IBus_1_0_gir_LIBS = $(libibus)
IBus_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))

12
ibus.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Mar 7 21:54:43 UTC+8 2012 - hillwood@linuxfans.org
- Fix FSF-address warnings in RPMLINT report
-------------------------------------------------------------------
Wed Mar 07 12:27:57 UTC+8 2012 - hillwood@linuxfans.org
- Update to 1.4.1
* Many bug fixings
- Fix several RPMLINT report warnings
-------------------------------------------------------------------
Sun Feb 12 17:29:16 UTC 2012 - ftake@geeko.jp

13
ibus.spec
View File

@ -21,7 +21,7 @@
%define domain_name %{name}10
Name: ibus
Version: 1.4.0
Version: 1.4.1
Release: 0
Url: http://code.google.com/p/ibus/
Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
@ -31,13 +31,16 @@ Source3: xim.ibus.suse.template
Source4: xim.d-ibus-121
Patch0: ibus-python-install-dir.patch
Patch1: ibus-fix-default-preload-engines.patch
Patch2: ibus-src-Makefile.am.diff
Patch3: ibus-fsf-address.patch
Summary: Intelligent Input Bus for Linux OS
License: LGPL-2.1+
Group: System/I18n/Chinese
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: /usr/bin/touch
Provides: locale(ja;ko;zh)
BuildRequires: pkg-config
BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-1-python-devel
BuildRequires: fdupes
BuildRequires: gconf2-devel
@ -65,7 +68,6 @@ developers to develop input method easily.
%package -n libibus-1_0-0
Summary: IBus libraries
Group: System/I18n/Chinese
Obsoletes: libibus2 < %{version}
%description -n libibus-1_0-0
This package contains the libraries for IBus
@ -110,6 +112,7 @@ Requires: typelib-1_0-IBus-1_0 = %{version}
Requires: glib2-devel
Requires: dbus-1-devel
Requires: gtk-doc
Requires: ibus = %{version}
%description devel
The ibus-devel package contains the header files and developer
@ -120,6 +123,8 @@ docs for ibus.
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
autoreconf -fi
@ -166,7 +171,7 @@ ln -sf %{_datadir}/icons/hicolor/48x48/apps/ibus-keyboard.png \
$RPM_BUILD_ROOT%{_datadir}/pixmaps/ibus-keyboard.png
%suse_update_desktop_file %name Utility DesktopUtility
%suse_update_desktop_file ibus-setup System SystemSetup
%suse_update_desktop_file %name-setup System Utility settings
%find_lang %{domain_name}
%find_gconf_schemas