- updated to 3.2.2

- removed obsolete -locale-names.patch

Changed files:
    drwright.spec -> 1.21

diff --git a/drwright.spec b/drwright.spec
index a51c84ee0f40e125c819c2f07ac2f04ee4ea5f73..51e3fd1b0668b087aa5863bef038a41cb7734b32 100644 (file)
--- a/drwright.spec
+++ b/drwright.spec
@@ -1,27 +1,32 @@
 Summary:       A program that reminds you to take wrist breaks
 Summary(pl.UTF-8):     Program przypominający, żeby dać odpocząć nadgarstkom
 Name:          drwright
-Version:       0.18
+Version:       3.2.2
 Release:       1
-License:       GPL
-Group:         Applications/System
-Source0:       http://ftp.gnome.org/pub/gnome/sources/drwright/0.18/%{name}-%{version}.tar.bz2
+License:       GPL v2
+Group:         X11/Applications
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/drwright/3.2/%{name}-%{version}.tar.xz
 # Source0-md5: 5056d36520b0a506e5bf3211f08315b8
-Patch0:                %{name}-locale-names.patch
-URL:           http://www.imendio.com/projects/drwright/
-BuildRequires: GConf2-devel >= 1.2.0
+URL:           http://www.gnome.org/
 BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: dbus-glib-devel >= 0.22
-BuildRequires: fontconfig-devel
-BuildRequires: gtk+2-devel >= 2:2.2.0
-BuildRequires: intltool >= 0.29
-BuildRequires: libglade2-devel >= 2.0.0
-BuildRequires: libgnomeui-devel >= 2.0.0
-BuildRequires: pango-devel >= 1:1.2.0
+BuildRequires: automake >= 1:1.9
+BuildRequires: glib2-devel >= 1:2.26.0
+BuildRequires: gnome-settings-daemon-devel >= 3.0.0
+BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: intltool >= 0.40.0
+BuildRequires: libcanberra-gtk3-devel
+BuildRequires: libnotify-devel >= 0.7
+BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: xft-devel
-Requires(post):        GConf2
+BuildRequires: rpmbuild(macros) >= 1.592
+BuildRequires: tar >= 1:1.22
+BuildRequires: xorg-lib-libXScrnSaver-devel
+BuildRequires: xz
+Requires(post,postun): gtk-update-icon-cache
+Requires(post,postun): glib2 >= 1:2.26.0
+Requires:      gnome-control-center >= 3.0.0
+Requires:      gnome-settings-daemon >= 3.0.0
+Requires:      hicolor-icon-theme
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,26 +39,31 @@ odpocząć dłoniom.
 
 %prep
 %setup -q
-%patch0 -p1
-
-mv po/{no,nb}.po
 
 %build
+%{__intltoolize}
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
-       --disable-schemas-install
+       --disable-silent-rules \
+       --disable-static
 
-%{__make} \
-       CFLAGS="%{rpmcflags} -fno-strict-aliasing"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+       DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/*.la
+
+# already exists as zu
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/tmp
 
 %find_lang %{name}
 
@@ -61,12 +71,23 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install
+%update_icon_cache hicolor
+%glib_compile_schemas
+
+%postun
+%update_icon_cache hicolor
+%glib_compile_schemas
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/drwright.schemas
-%{_desktopdir}/*.desktop
+%doc AUTHORS ChangeLog NEWS
+%attr(755,root,root) %{_libdir}/control-center-1/panels/libdrwrightccp.so
+%dir %{_libdir}/drwright
+%attr(755,root,root) %{_libdir}/drwright/gnome-typing-monitor
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libtyping-break.so
+%{_libdir}/gnome-settings-daemon-3.0/typing-break.gnome-settings-plugin
+%{_desktopdir}/gnome-typing-break-panel.desktop
 %{_datadir}/drwright
+%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.typing-break.gschema.xml
+%{_iconsdir}/hicolor/*/*/*.png
+%{_iconsdir}/hicolor/*/*/*.svg