- merged from DEVEL and updated to 2.8.0

Changed files:
    bug-buddy.spec -> 1.25

diff --git a/bug-buddy.spec b/bug-buddy.spec
index a607cc005dbc8d4bcb481176c2af85d45d23c671..ccf97ed4aa2b12c416ab14fcb0357d7150092f4e 100644 (file)
--- a/bug-buddy.spec
+++ b/bug-buddy.spec
@@ -1,28 +1,26 @@
 Summary:       Utility to ease the reporting of bugs within the GNOME
 Summary(pl):   Narzêdzie u³atwiaj±ce zg³aszanie b³êdów w ¶rodowisku GNOME
 Name:          bug-buddy
-Version:       2.6.1
+Version:       2.8.0
 Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: a9a8fb40fc762fb09ab587c2e0460653
-Patch0:                %{name}-locale-names.patch
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
+# Source0-md5: b4c90bb9e1762803d083026b000349ea
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel
+BuildRequires: GConf2-devel >= 2.7.92
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: glib2-devel >= 2.4.0
 BuildRequires: gtk+2-devel >= 2:2.4.0
-BuildRequires: gnome-desktop-devel >= 2.6.0
-BuildRequires: gnome-vfs2-devel >= 2.6.0
+BuildRequires: gnome-desktop-devel >= 2.7.92
+BuildRequires: gnome-vfs2-devel >= 2.7.92
 BuildRequires: intltool >= 0.29
-BuildRequires: libglade2-devel >= 1:2.3.6
-BuildRequires: libgnomeui-devel >= 2.6.0
+BuildRequires: libglade2-devel >= 1:2.4.0
+BuildRequires: libgnomeui-devel >= 2.7.92
 BuildRequires: libxml2-devel >= 2.4.6
 BuildRequires: scrollkeeper >= 0.3.8
-Requires(post):        GConf2
-Requires(post):        scrollkeeper
+Requires(post):        GConf2 >= 2.7.92
+Requires(post,postun): scrollkeeper
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,9 +38,6 @@ KDE.
 
 %prep
 %setup -q
-%patch0 -p1
-
-mv po/{no,nb}.po
 
 %build
 glib-gettextize --copy --force
@@ -62,16 +57,23 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+umask 022
 /usr/bin/scrollkeeper-update
 %gconf_schema_install
+[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
 
-%postun -p /usr/bin/scrollkeeper-update
+%postun
+umask 022
+/usr/bin/scrollkeeper-update
+[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)