- updated to 0.10

[packages/bluefish.git] / bluefish.spec

diff --git a/bluefish.spec b/bluefish.spec
index d4f6b145689ca33bb1d6d490b73e8e7b45c23dec..b87135de24b6e7ebf0217b1df8d40583d0d64af9 100644 (file)
--- a/bluefish.spec
+++ b/bluefish.spec
@@ -2,35 +2,32 @@ Summary:      Bluefish - HTML editor for the experienced web designer
 Summary(pl):   Bluefish - Edytor HTML dla zaawansowanych
 Summary(pt_BR):        Editor HTML Bluefish
 Name:          bluefish
-Version:       0.7
-Release:       5
+Version:       0.10
+Release:       1       
 License:       GPL
 Group:         X11/Applications/Editors
 # The master server is here
 Source0:       http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/%{name}-%{version}.tar.bz2
+# Source0-md5: 557271d19d53b0857c7290ff994a8637
 # but if you want ftp: try this one
 # Source0:     ftp://bluefish.advancecreations.com/bluefish/downloads/%{name}-%{version}.tar.bz2
-Source1:       %{name}.desktop
-Source2:       %{name}.png
+Source1:       %{name}.png
 Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-ac_lt.patch
-Patch2:                %{name}-locale.patch
-Patch3:                %{name}-netscape-now-mozilla.patch
-Patch4:                %{name}-pl.patch
 URL:           http://bluefish.openoffice.nl/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libtool
 BuildRequires: gettext-devel
-BuildRequires: gtk+-devel >= 1.2.0
+BuildRequires: gtk+2-devel
 BuildRequires: imlib-devel
 BuildRequires: libjpeg-devel
-BuildRequires: libpng >= 1.0.8
+BuildRequires: libpng >= 1.2.5
 BuildRequires: libtiff-devel
+BuildRequires: libtool
 BuildRequires: libungif-devel
+BuildRequires: pcre-devel
+BuildRequires: pkgconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
 %description
 Bluefish is a GTK+ based HTML editor designed for the experienced web
 designer.
@@ -48,17 +45,13 @@ Bluefish 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %ifarch i586
-OPTIMIZATION="--with-pentium"
+OPTIMIZATION="--enable-gcc3-optimization=pentium"
 %endif
 %ifarch i686 athlon
-OPTIMIZATION="--with-pentiumpro"
+OPTIMIZATION="--enable-gcc3-optimization=pentiumpro"
 %endif
 
 %{__gettextize}
@@ -66,22 +59,18 @@ OPTIMIZATION="--with-pentiumpro"
 %{__aclocal}
 %{__autoconf}
 %configure \
-       --with-install-location=%{_datadir}/bluefish \
-       --with-autocomplet \
-       $OPTIMIZATION
-       
+       $OPTIMIZATION   
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Editors/HTML,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}/
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Editors/HTML
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
-
 %find_lang %{name}
 
 %clean
@@ -89,10 +78,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README ChangeLog BUGS AUTHORS NEWS TODO
+%doc doc 
 %attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
-
-%{_datadir}/bluefish
-%{_applnkdir}/Editors/HTML/bluefish.desktop
+%{_datadir}/%{name}
+%{_desktopdir}/*
 %{_pixmapsdir}/*