[packages/dasher] - switch to git snapshot for gtk3 / gnome 3
baggins
baggins at pld-linux.org
Tue May 5 22:02:40 CEST 2015
commit c49bf0d392e203cfa20276c783fe1e80ef3206df
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue May 5 22:02:15 2015 +0200
- switch to git snapshot for gtk3 / gnome 3
dasher-format-security.patch | 11 ----------
dasher.spec | 50 ++++++++++++++++++++++++--------------------
2 files changed, 27 insertions(+), 34 deletions(-)
---
diff --git a/dasher.spec b/dasher.spec
index a12564c..3753d08 100644
--- a/dasher.spec
+++ b/dasher.spec
@@ -1,39 +1,38 @@
+%define snap g9a09c4e
Summary: Predictive text entry application
Summary(pl.UTF-8): Przewidująca aplikacja do wprowadzania tekstu
Name: dasher
Version: 4.11
-Release: 4
+Release: 4.%{snap}.1
License: GPL v2
Group: X11/Applications/Accessibility
-Source0: http://ftp.gnome.org/pub/GNOME/sources/dasher/4.11/%{name}-%{version}.tar.bz2
-# Source0-md5: 55695cacecb9fa9e3259e0f2ef82ae9e
-Patch0: %{name}-format-security.patch
+#Source0: http://ftp.gnome.org/pub/GNOME/sources/dasher/4.11/%{name}-%{version}.tar.bz2
+Source0: %{name}-%{version}-%{snap}.tar.bz2
+# Source0-md5: 5012a6761eebcc4d4ca62886ffa6c9ec
URL: http://www.inference.phy.cam.ac.uk/dasher/
-BuildRequires: GConf2-devel >= 2.20.0
-BuildRequires: ORBit2-devel >= 1:2.14.7
-BuildRequires: at-spi-devel >= 1.20.0
-BuildRequires: atk-devel >= 1.20.0
+BuildRequires: atk-devel >= 2.16.0
+BuildRequires: at-spi2-core-devel
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.8
+BuildRequires: cairo-devel
BuildRequires: docbook-dtd412-xml
BuildRequires: expat-devel
BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:2.16.1
BuildRequires: gnome-doc-utils
-BuildRequires: gnome-speech-devel >= 0.4.10
-BuildRequires: gtk+2-devel >= 2:2.18.0
+BuildRequires: gtk+3-devel
BuildRequires: intltool >= 0.40.1
-BuildRequires: libbonobo-devel >= 2.20.0
-BuildRequires: libgnomeui-devel >= 2.20.0
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: rpmbuild(find_lang) >= 1.23
BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: speech-dispatcher-devel
+BuildRequires: xorg-lib-libICE-devel
BuildRequires: xorg-lib-libXtst-devel
+Requires(post,preun): glib2 >= 1:2.28.0
Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): hicolor-icon-theme
Requires(post,postun): scrollkeeper
-Requires(post,preun): GConf2
# sr at Latn vs. sr at latin
Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,8 +63,7 @@ użyciu myszy doświadczeni użytkownicy mogą pisać nawet 39 słów na
minutę.
%prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}-%{snap}
%build
%{__glib_gettextize}
@@ -76,11 +74,14 @@ minutę.
%{__autoheader}
%{__automake}
%configure \
+ GLIB_COMPILE_SCHEMAS=/bin/true \
+ --disable-schemas-install \
--with-gnome \
- --enable-speech \
- --enable-a11y \
+ --enable-speech=speechdispatcher \
+ --enable-atspi \
--disable-scrollkeeper \
- --with-cairo
+ --with-cairo \
+ --with-gsettings
%{__make}
%install
@@ -95,22 +96,25 @@ rm -rf $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT
%post
-%gconf_schema_install dasher.schemas
+{
+umask 022
+/usr/bin/glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas
+}
%scrollkeeper_update_post
+%update_desktop_database_post
%update_icon_cache hicolor
-%preun
-%gconf_schema_uninstall dasher.schemas
-
%postun
+%glib_compile_schemas
%scrollkeeper_update_postun
+%update_desktop_database_postun
%update_icon_cache hicolor
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog MAINTAINERS README
%attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/dasher.schemas
+%{_datadir}/glib-2.0/schemas/dasher.gschema.xml
%{_datadir}/%{name}
%{_desktopdir}/%{name}.desktop
%{_iconsdir}/hicolor/48x48/apps/%{name}.png
diff --git a/dasher-format-security.patch b/dasher-format-security.patch
deleted file mode 100644
index 15b0457..0000000
--- a/dasher-format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dasher-4.11/Src/Gtk2/game_mode_helper.cpp~ 2009-12-18 19:40:29.000000000 +0100
-+++ dasher-4.11/Src/Gtk2/game_mode_helper.cpp 2012-11-12 22:40:43.545981765 +0100
-@@ -324,7 +324,7 @@
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_OK,
-- message);
-+ "%s", message);
- gtk_dialog_run (GTK_DIALOG (pDialog));
- gtk_widget_destroy (pDialog);
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dasher.git/commitdiff/c49bf0d392e203cfa20276c783fe1e80ef3206df
More information about the pld-cvs-commit
mailing list