SHA256
1
0
forked from pool/gucharmap

Accepting request 105129 from GNOME:Factory

Pushing most G:F bits

OBS-URL: https://build.opensuse.org/request/show/105129
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gucharmap?expand=0&rev=55
This commit is contained in:
Stephan Kulow 2012-02-16 11:22:27 +00:00 committed by Git OBS Bridge
commit 047bf0c9e9
5 changed files with 65 additions and 29 deletions

View File

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

3
gucharmap-3.3.1.tar.xz Normal file
View File

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

View File

@ -0,0 +1,20 @@
commit 15ad66f28147ee0228185fe7171b736f041374e4
Author: Vincent Untz <vuntz@gnome.org>
Date: Thu Feb 9 10:56:03 2012 +0100
Fix pkg-config file to not reference old gconf-related variable
https://bugzilla.gnome.org/show_bug.cgi?id=669734
diff --git a/gucharmap.pc.in b/gucharmap.pc.in
index 664f90a..4d776dd 100644
--- a/gucharmap.pc.in
+++ b/gucharmap.pc.in
@@ -7,6 +7,6 @@ Name: gucharmap
Description: GTK+ Unicode Character Map
Version: @VERSION@
Requires: gtk+-@GTK_API_VERSION@ glib-2.0
-Requires.private: @GCONFPKGS@
+Requires.private: gio-2.0
Libs: -L${libdir} -lgucharmap@GUCHARMAP_LIBRARY_SUFFIX_U@
Cflags: -I${includedir}/gucharmap-@GUCHARMAP_API_VERSION@

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Thu Feb 9 09:59:47 UTC 2012 - vuntz@opensuse.org
- Add gucharmap-fix-pkg-config.patch: fix broken pkg-config file
after move to GSettings.
-------------------------------------------------------------------
Tue Feb 7 10:46:01 UTC 2012 - vuntz@opensuse.org
- Update to version 3.3.1:
+ Updated to Unicode 6.1.0
+ Ported to GSettings
+ Misc cleanup and bug fixes
+ Updated translations.
- Remove xz BuildRequires now that it comes for free in the build
system.
- Remove gconf2-devel BuildRequires.
- Replace gconf packaging machinery with %glib2_gsettings_schema_*
macros.
- Remove checks for old non-maintained versions of openSUSE (<=
11.2)
-------------------------------------------------------------------
Tue Dec 20 11:21:59 UTC 2011 - vuntz@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package gucharmap
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 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,8 +21,16 @@
%define pc_api 2.90
Name: gucharmap
Version: 3.3.1
Release: 0
Summary: A Featureful Unicode Character Map
License: GPL-3.0+ ; LGPL-2.1+
Group: System/GUI/GNOME
Url: http://gucharmap.sourceforge.net/
Source: http://download.gnome.org/sources/gucharmap/3.3/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gucharmap-fix-pkg-config.patch bgo#669734 vuntz@opensuse.org -- Fix broken pkg-config file
Patch0: gucharmap-fix-pkg-config.patch
BuildRequires: fdupes
BuildRequires: gconf2-devel
BuildRequires: gnome-doc-utils-devel
BuildRequires: gobject-introspection-devel
BuildRequires: gtk-doc
@ -31,24 +39,15 @@ BuildRequires: intltool
BuildRequires: scrollkeeper
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
BuildRequires: xz
Version: 3.3.0
Release: 0
Summary: A Featureful Unicode Character Map
License: GPL-3.0+ ; LGPL-2.1+
Group: System/GUI/GNOME
Source: http://download.gnome.org/sources/gucharmap/3.3/%{name}-%{version}.tar.xz
Url: http://gucharmap.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pkgconfig(gio-2.0) >= 2.25.5
Recommends: %{name}-lang
%gconf_schemas_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%glib2_gsettings_schema_requires
%description
Gucharmap is a featureful unicode character map.
%package -n libgucharmap%{so_api}-%{so_gucharmap}
Summary: A Featureful Unicode Character Map -- Library
Group: System/GUI/GNOME
@ -81,6 +80,7 @@ to develop applications that require these.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%build
%configure --disable-static --with-pic \
@ -92,37 +92,29 @@ make %{?_smp_mflags} V=1
%install
%makeinstall
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
%find_lang %{name} %{?no_lang_C}
%find_gconf_schemas
%fdupes $RPM_BUILD_ROOT
# We need X-SuSE-Editor to avoid an error for the categories check. We don't
# want TextEditor, since that's too wide.
%suse_update_desktop_file -N "GNOME Character Map" -G "Character Map" %{name} X-SuSE-Editor
%fdupes $RPM_BUILD_ROOT
%post -n libgucharmap%{so_api}-%{so_gucharmap} -p /sbin/ldconfig
%postun -n libgucharmap%{so_api}-%{so_gucharmap} -p /sbin/ldconfig
%pre -f %{name}.schemas_pre
%post
%glib2_gsettings_schema_post
%desktop_database_post
%preun -f %{name}.schemas_preun
%postun
%glib2_gsettings_schema_postun
%desktop_database_postun
%posttrans -f %{name}.schemas_posttrans
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.schemas_list
%files
%defattr(-,root,root)
%doc COPYING ChangeLog NEWS README TODO
%dir %{_datadir}/gnome/
@ -136,6 +128,8 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/gnome-character-map
%{_bindir}/gucharmap
%{_datadir}/applications/gucharmap.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.Charmap.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.Charmap.gschema.xml
%files -n libgucharmap%{so_api}-%{so_gucharmap}
%defattr(-,root,root)