updated: bluefish, nano

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@609 ec354946-7b23-47d6-9f5a-488ba84defc7

b/bluefish/bluefish-vl.spec

@@ -1,21 +1,23 @@
 Summary: The Bluefish HTML Editor
 Summary(ja): Bluefish HTML エディタ
 Name: bluefish
-Version: 1.0.7
-Release: 2%{?_dist_release}
+Version: 2.0.0
+Release: 1%{?_dist_release}
 License: GPL
 Group:   Applications/Editors
-Source:  http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/%{name}-%{version}.tar.bz2
-#Patch0:  bluefish-1.0.4-pcreutf8.patch
+Source:  http://downloads.sourceforge.net/project/bluefish/bluefish/2.0.0/%{name}-%{version}.tar.bz2
 
 URL: http://bluefish.openoffice.nl/
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Prereq: shared-mime-info
-Requires: gtk2, gnome-vfs2 >= 2.4.1 
-Requires: pcre >= 3.9, aspell >= 0.50
-BuildRequires: gtk2-devel, gnome-vfs2-devel >= 2.4.1 
-BuildRequires: pcre-devel >= 3.9, aspell-devel >= 0.50
+BuildRequires: gtk2-devel >= 2.14.0 
+BuildRequires: pcre-devel >= 3.9
+BuildRequires: enchant-devel 
+BuildRequires: gucharmap-devel
 BuildRequires: desktop-file-utils shared-mime-info
+Requires(post): desktop-file-utils shared-mime-info
+Requires: gtk2 >= 2.14.0 
+Requires: pcre >= 3.9
 
 Distribution: Vine Linux
 Vendor: Project Vine
@@ -35,13 +37,6 @@ Bluefish は動的な対話型ウェブサイトをプログラミングのた
 
 %prep
 %setup -q -n %{name}-%{version}
-#%patch0 -p1 -b .pcreutf8
-# version 1.0.4, po file included in ./configure script 
-#
-#mv configure configure.org
-#sed -e 's/ALL_LINGUAS=./ALL_LINGUAS=\"ja /' \
-#     configure.org > configure
-#chmod +x configure
 
 %build
 %configure --disable-update-databases
@@ -51,47 +46,56 @@ make %{?_smp_mflags}
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
-#makeinstall \
-#    pkgdatadir=$RPM_BUILD_ROOT%{_datadir}/%{name}                \
-#    gnome2applications=$RPM_BUILD_ROOT%{_datadir}/applications/  \
-#    gnome1menupath=we_do_not_install_this_one                 \
-#    gnome2icons=$RPM_BUILD_ROOT%{_datadir}/pixmaps               \
-#    gnome2appreg=$RPM_BUILD_ROOT%{_datadir}/application-registry \
-#    gnome2mime-info=$RPM_BUILD_ROOT%{_datadir}/mime-info         \
-#    iconpath=$RPM_BUILD_ROOT%{_datadir}/pixmaps                  
 
 # added JIS to default encoding 
 echo "JIS (Japanese):ISO-2022-JP:" >> \
     $RPM_BUILD_ROOT%{_datadir}/bluefish/encodings.default
 
-%find_lang %{name}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/bluefish/*.la
 
 #remove docs because duplicate
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bluefish-project.desktop
 
 %post 
-%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
+if [ $1 -eq 0 ] ; then
+    update-desktop-database -q  &> /dev/null || :
+    update-mime-database %{_datadir}/mime &> /dev/null || :
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    gtk-update-icon-cache %{_datadir}/icons/hicolor  &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q  &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor  &> /dev/null || :
 
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files
 %defattr(-, root, root)
 %doc [A-LN-Z]*
 %{_bindir}/bluefish
+%dir %{_libdir}/bluefish
+%{_libdir}/bluefish/*.so
 %{_datadir}/bluefish
+%{_datadir}/icons/hicolor/*
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/bluefish.desktop
-%{_datadir}/application-registry/*.applications
-%{_datadir}/mime-info/*
+%{_datadir}/locale/*/*/*.mo
 %{_datadir}/mime/packages/*.xml
+%{_datadir}/xml/bluefish
 %{_mandir}/man1/*
 
 %changelog
+* Fri Mar 19 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.0.0-1
+- new upstream release
+- updated BR
+
 * Thu Jul 30 2009 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.7-2
 - added Japanese description
 

n/nano/nano-vl.spec

@@ -1,6 +1,6 @@
 Summary: Pico editor clone with enhancements
 Name: nano
-Version: 2.2.1
+Version: 2.2.3
 Release: 1%{?_dist_release}
 License: GPL
 Group: Applications/Editors
@@ -53,6 +53,9 @@ fi
 %{_datadir}/nano/*
 
 %changelog
+* Fri Mar 19 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.3-1
+- new upstream release
+
 * Fri Jan  1 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.1-1
 - new upstream release
 - added %post, %preun section