diff --git a/.gitignore b/.gitignore index 5c46a8a..2ad8d87 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ gucharmap-2.30.1.tar.bz2 /gucharmap-2.31.90.tar.bz2 /gucharmap-2.31.91.tar.bz2 /gucharmap-2.32.0.tar.bz2 +/gucharmap-2.33.0.tar.bz2 diff --git a/gucharmap.spec b/gucharmap.spec index 5dae8ab..ce2b13d 100644 --- a/gucharmap.spec +++ b/gucharmap.spec @@ -1,9 +1,9 @@ %define glib2_version 2.3.0 -%define gtk2_version 2.6.0 +%define gtk2_version 2.91.0 %define desktop_file_utils_version 0.9 Name: gucharmap -Version: 2.32.0 +Version: 2.33.0 Release: 1%{?dist} Summary: Unicode character picker and font browser @@ -12,11 +12,11 @@ License: GPLv2+ and GFDL and MIT # GPL for the source code, GFDL for the docs, MIT for Unicode data URL: http://live.gnome.org/Gucharmap #VCS: git:git://git.gnome.org/gucharmap -Source: http://download.gnome.org/sources/gucharmap/2.32/gucharmap-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gucharmap/2.33/gucharmap-%{version}.tar.bz2 BuildRequires: gnome-doc-utils >= 0.3.2 BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: GConf2-devel BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: scrollkeeper @@ -48,7 +48,7 @@ needed to use the libgucharmap library. %setup -q %build -%configure --disable-gtk-immodules --disable-scrollkeeper +%configure --with-gtk=3.0 --disable-gtk-immodules --disable-scrollkeeper make %{?_smp_mflags} @@ -64,22 +64,6 @@ desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/* -# save space by linking identical images in translated docs -helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name} -for f in $helpdir/C/figures/*.png; do - b="$(basename $f)" - for d in $helpdir/*; do - if [ -d "$d" -a "$d" != "$helpdir/C" ]; then - g="$d/figures/$b" - if [ -f "$g" ]; then - if cmp -s $f $g; then - rm "$g"; ln -s "../../C/figures/$b" "$g" - fi - fi - fi - done -done - %find_lang gucharmap --with-gnome @@ -112,19 +96,22 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_bindir}/charmap %{_bindir}/gucharmap %{_bindir}/gnome-character-map -%{_libdir}/libgucharmap.so.* +%{_libdir}/libgucharmap_2_90.so.* %{_datadir}/applications/gnome-gucharmap.desktop %{_sysconfdir}/gconf/schemas/gucharmap.schemas %files devel %defattr(-,root,root,-) -%{_includedir}/gucharmap-2.0 -%{_libdir}/libgucharmap.so -%{_libdir}/pkgconfig/gucharmap-2.pc +%{_includedir}/gucharmap-2.90 +%{_libdir}/libgucharmap_2_90.so +%{_libdir}/pkgconfig/gucharmap-2.90.pc %changelog +* Mon Oct 4 2010 Matthias Clasen - 2.33.0-1 +- Update to 2.33.0 + * Wed Sep 29 2010 Matthias Clasen - 2.32.0-1 - Update to 2.32.0 diff --git a/sources b/sources index 3b2beda..071d269 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a2eb13af8e2c51a811b96748378d351 gucharmap-2.32.0.tar.bz2 +48284d771ade66bdd8cda738b93db985 gucharmap-2.33.0.tar.bz2