From 837712f7f93b98056622d4115f3de62f742cf7b720fc83bf044ef088ea6cb38d Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 26 Apr 2011 06:11:58 +0000 Subject: [PATCH] Accepting request 67412 from GNOME:Next thanks OBS-URL: https://build.opensuse.org/request/show/67412 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gucharmap?expand=0&rev=60 --- gucharmap-2.32.1.tar.bz2 | 3 --- gucharmap-3.0.0.tar.bz2 | 3 +++ gucharmap.changes | 20 ++++++++++++++ gucharmap.spec | 56 +++++++++++++++++----------------------- 4 files changed, 47 insertions(+), 35 deletions(-) delete mode 100644 gucharmap-2.32.1.tar.bz2 create mode 100644 gucharmap-3.0.0.tar.bz2 diff --git a/gucharmap-2.32.1.tar.bz2 b/gucharmap-2.32.1.tar.bz2 deleted file mode 100644 index cdb5f97..0000000 --- a/gucharmap-2.32.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdef066f35f4301bc128b91f15a30d64a2459721cb50daa53f923789df315c28 -size 3242939 diff --git a/gucharmap-3.0.0.tar.bz2 b/gucharmap-3.0.0.tar.bz2 new file mode 100644 index 0000000..53f0235 --- /dev/null +++ b/gucharmap-3.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e95c161f7c229e27a7acb3d5212a95ec3564b5bc2964c1607ab32ef24f093bf0 +size 3274335 diff --git a/gucharmap.changes b/gucharmap.changes index 92762a5..289739b 100644 --- a/gucharmap.changes +++ b/gucharmap.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Apr 4 14:31:05 UTC 2011 - fcrozat@novell.com + +- Update to version 3.0.0: + + Updated to Unicode 6.0.0 + + Support building with gtk+ 3.0 + + Update introspection support, and add annotations + + Many bug fixes. + + Updated translations. +- Add rpm defines to help monitor soname / api version changes +- Remove python binding package (python-gucharmap), now handled by + pygobject introspection. +- Remove python-gtk-devel BuildRequires +- BuildRequire gobject-introspection-devel and pass + --enable-introspection to configure +- Build with gtk3: + + Replace gtk2-devel BuildRequires with gtk3-devel + + Pass --with-gtk=3.0 to configure +- Use _smp_mflags macro. + ------------------------------------------------------------------- Mon Feb 14 19:49:23 CET 2011 - sbrabec@suse.cz diff --git a/gucharmap.spec b/gucharmap.spec index 83551a2..212d7e0 100644 --- a/gucharmap.spec +++ b/gucharmap.spec @@ -17,6 +17,10 @@ # norootforbuild +%define api_version 2.90 +%define so_api _2_90 +%define so_gucharmap 7 +%define pc_api 2.90 Name: gucharmap BuildRequires: fdupes @@ -24,15 +28,15 @@ BuildRequires: gnome-doc-utils-devel BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: gconf2-devel -BuildRequires: gtk2-devel -BuildRequires: python-gtk-devel +BuildRequires: gobject-introspection-devel +BuildRequires: gtk3-devel BuildRequires: scrollkeeper BuildRequires: translation-update-upstream BuildRequires: update-desktop-files License: GPLv3+ ; LGPLv2.1+ Group: System/GUI/GNOME -Version: 2.32.1 -Release: 9 +Version: 3.0.0 +Release: 0 Summary: A Featureful Unicode Character Map Source: %{name}-%{version}.tar.bz2 Url: http://gucharmap.sourceforge.net/ @@ -43,31 +47,21 @@ Recommends: %{name}-lang %description Gucharmap is a featureful unicode character map. -%package -n libgucharmap7 +%package -n libgucharmap%{so_api}-%{so_gucharmap} License: GPLv3+ ; LGPLv2.1+ Summary: A Featureful Unicode Character Map -- Library Group: System/GUI/GNOME -%description -n libgucharmap7 +%description -n libgucharmap%{so_api}-%{so_gucharmap} Gucharmap is a featureful unicode character map. This package contains a library to use the character map. -%package -n python-gucharmap -License: GPLv3+ ; LGPLv2.1+ -Summary: A Featureful Unicode Character Map -- Python Bindings -Group: System/GUI/GNOME - -%description -n python-gucharmap -Gucharmap is a featureful unicode character map. - -This package contains the python bindings to use the character map. - %package devel License: GPLv3+ ; LGPLv2.1+ Summary: A Featureful Unicode Character Map -- Development Files Group: Development/Libraries/GNOME -Requires: libgucharmap7 = %{version} +Requires: libgucharmap%{so_api}-%{so_gucharmap} = %{version} %description devel This package contains all necessary include files and libraries needed @@ -82,8 +76,9 @@ translation-update-upstream %configure --disable-static --with-pic \ --disable-scrollkeeper \ --enable-gtk-doc \ - --enable-python-bindings -make %{?jobs:-j%jobs} + --with-gtk=3.0 \ + --enable-introspection +make %{?_smp_mflags} V=1 %install %makeinstall @@ -98,9 +93,9 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print # want TextEditor, since that's too wide. %suse_update_desktop_file -N "GNOME Character Map" -G "Character Map" %{name} X-SuSE-Editor -%post -n libgucharmap7 -p /sbin/ldconfig +%post -n libgucharmap%{so_api}-%{so_gucharmap} -p /sbin/ldconfig -%postun -n libgucharmap7 -p /sbin/ldconfig +%postun -n libgucharmap%{so_api}-%{so_gucharmap} -p /sbin/ldconfig %pre -f %{name}.schemas_pre @@ -132,22 +127,19 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/gucharmap %{_datadir}/applications/gucharmap.desktop -%files -n libgucharmap7 +%files -n libgucharmap%{so_api}-%{so_gucharmap} %defattr(-,root,root) -%{_libdir}/libgucharmap.so.* - -%files -n python-gucharmap -%defattr(-,root,root) -%{py_sitedir}/gtk-2.0/gucharmap.so -%{_datadir}/pygtk/2.0/defs/gucharmap.defs +%{_libdir}/libgucharmap%{so_api}.so.%{so_gucharmap}* +%{_libdir}/girepository-1.0/Gucharmap-%{pc_api}.typelib %files lang -f %{name}.lang %files devel %defattr (-, root, root) -%{_includedir}/gucharmap-2.0/ -%{_libdir}/libgucharmap.so -%{_libdir}/pkgconfig/gucharmap-2.pc -%doc %{_datadir}/gtk-doc/html/gucharmap-2.0/ +%{_includedir}/gucharmap-%{pc_api}/ +%{_libdir}/libgucharmap%{so_api}.so +%{_libdir}/pkgconfig/gucharmap-%{pc_api}.pc +%{_datadir}/gir-1.0/Gucharmap-%{pc_api}.gir +%doc %{_datadir}/gtk-doc/html/gucharmap-%{pc_api}/ %changelog