From 38f743440d9518a131ee0c6c3fbad8ec78cf827b31c1e77a1f03654ec0dafcfc Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Sun, 9 May 2010 19:14:53 +0000
Subject: [PATCH] - add intltool to BuildRequires

OBS-URL: https://build.opensuse.org/package/show/Education/bluefish?expand=0&rev=3
---
 bluefish-1.0.7.tar.bz2     |   3 ---
 bluefish-2.0.0-rc3.tar.bz2 |   3 ---
 bluefish-2.0.0.tar.bz2     |   3 +++
 bluefish-2.0.0.tar.bz2.sig | Bin 0 -> 280 bytes
 bluefish.changes           |   5 +++++
 bluefish.spec              |  37 +++++++++++++++----------------------
 6 files changed, 23 insertions(+), 28 deletions(-)
 delete mode 100644 bluefish-1.0.7.tar.bz2
 delete mode 100644 bluefish-2.0.0-rc3.tar.bz2
 create mode 100644 bluefish-2.0.0.tar.bz2
 create mode 100644 bluefish-2.0.0.tar.bz2.sig

diff --git a/bluefish-1.0.7.tar.bz2 b/bluefish-1.0.7.tar.bz2
deleted file mode 100644
index b62605f..0000000
--- a/bluefish-1.0.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68cb74b993ad31a86083e8eed482b2f5b4d523806538ea9bc42bfa8b4c0a1110
-size 1495619
diff --git a/bluefish-2.0.0-rc3.tar.bz2 b/bluefish-2.0.0-rc3.tar.bz2
deleted file mode 100644
index 22b3665..0000000
--- a/bluefish-2.0.0-rc3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:754db0793843d4bc5316a04df853df15287dbf0cdbf3b6cbfb71e84487973df6
-size 3281619
diff --git a/bluefish-2.0.0.tar.bz2 b/bluefish-2.0.0.tar.bz2
new file mode 100644
index 0000000..ce09480
--- /dev/null
+++ b/bluefish-2.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0e41ba6a7d78392e5c62cf79744078f435d5e4188c58c406495c503871c916e
+size 3287346
diff --git a/bluefish-2.0.0.tar.bz2.sig b/bluefish-2.0.0.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..47c7266b4a0de6f40406bb963a6cf87e8edd114f3105f011245382e65ee6d659
GIT binary patch
literal 280
zcmV+z0q6dS0TlxU084pPwI&BX{MyBK<^c!|T?hRWo|^WC9>~hiY53n^a0=*_`~Yf~
z5pI<m0Q`|)8-(h}I_WD_DlPCqRhny2!Ds7F5sfx&-s-ATRLSmZyM8B}Kpukxw*BCH
z#Xkrnx>I_V9UAfe&p(gxdBd5N#086X*EgDBp?Hr(@5LM&ztb$(pm{`sMvuu<fJ!$4
zP5<m00ApY2jS-VRCALj5h=@HnCI&n#Tsx|g<4Z&G)pIQYEphsQPV#R5>Vq9&MsOfc
zFR^76F*;O|?dh3*@yhxYli&{vlnr1z9W_^Ew)h`&0e2T!dq_)2VE~Fzx+W>xi8Z7{
e%r=OqpsvV{_vDcG1x3kb5;Ht?;Ye}P#As&GE`d1!

literal 0
HcmV?d00001

diff --git a/bluefish.changes b/bluefish.changes
index 128e680..918777f 100644
--- a/bluefish.changes
+++ b/bluefish.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun May  9 19:10:34 UTC 2010 - lars@linux-schulserver.de
+
+- add intltool to BuildRequires
+
 -------------------------------------------------------------------
 Mon Sep 22 16:19:08 CEST 2008 - lars@linux-schulserver.de
 
diff --git a/bluefish.spec b/bluefish.spec
index 1b68dee..156fc5c 100644
--- a/bluefish.spec
+++ b/bluefish.spec
@@ -10,21 +10,17 @@
 
 Name:           bluefish
 Summary:        A feature-Rich HTML Editor
-Version:        1.99.3
-%define         real_version 2.0.0-rc3
-Release:        30
+Version:        2.0.0
+Release:        0
 Url:            http://bluefish.openoffice.nl/
 License:        GPL
 Group:          Productivity/Publishing/HTML/Editors
 Vendor:         openSUSE-Education
 BuildRequires:  aspell-devel libgnomeui-devel pcre-devel tidy update-desktop-files
-Source:         bluefish-%{real_version}.tar.bz2
+BuildRequires:  intltool
+Source:         %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} < 1030
-%define prefix /opt/gnome
-%else
-%define prefix /usr
-%endif
+%define         prefix %{_prefix}
 
 %description
 Bluefish is a HTML editor designed for the experienced Web designer 
@@ -38,12 +34,11 @@ Authors:
     Info <bluefish@bluefish.linuxbox.com>
 
 %prep
-%setup -q -n bluefish-%{real_version}
+%setup -q 
 
 %build
-%configure  --prefix=%{prefix} \
-            --with-icon-path=%{prefix}/share/pixmaps \
-            --with-gnome2-menu=%{prefix}/share/ \
+%configure  --with-icon-path=%{_datadir}/pixmaps \
+            --with-gnome2-menu=%{_datadir} \
             --without-freedesktop_org-mime \
             --disable-update-databases
 %{__make} %{?jobs:-j%jobs}
@@ -69,21 +64,19 @@ if [ -f /usr/bin/update-mime-database ]; then
 fi
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING README TODO
 %{_bindir}/bluefish
 %{_datadir}/bluefish
-%{prefix}/share/pixmaps/bluefish-icon.png
-%{prefix}/share/pixmaps/*bluefish-project.png
-/usr/share/applications/bluefish.desktop
-/usr/share/applications/bluefish-project.desktop
+%{_datadir}/pixmaps/bluefish-icon.png
+%{_datadir}/pixmaps/*bluefish-project.png
+%{_datadir}/applications/bluefish.desktop
+%{_datadir}applications/bluefish-project.desktop
 %{_mandir}/man1/bluefish.1*
-%if 0%{?suse_version} < 1030
-%{prefix}/share/application-registry/bluefish.applications
-%{prefix}/share/mime-info/bluefish.*
-%endif
+%{_datadir}/application-registry/bluefish.applications
+%{_datadir}/mime-info/bluefish.*
 
 %changelog