diff --git a/.cvsignore b/.cvsignore index 4b030d2..a05ad17 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bluefish-2.0.0-rc3.tar.bz2 +bluefish-2.0.0.tar.bz2 diff --git a/bluefish-2.0.0-dso-linking.patch b/bluefish-2.0.0-dso-linking.patch new file mode 100644 index 0000000..a444f89 --- /dev/null +++ b/bluefish-2.0.0-dso-linking.patch @@ -0,0 +1,102 @@ +--- bluefish-2.0.0/configure.ac.orig 2010-02-15 13:56:18.000000000 +0000 ++++ bluefish-2.0.0/configure.ac 2010-02-16 09:26:54.869074412 +0000 +@@ -452,6 +452,7 @@ + ) + AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xyes"]) + ++AC_SEARCH_LIBS([log10], [m]) + AC_SEARCH_LIBS([nanosleep], [posix4 rt]) + + AC_ARG_ENABLE( +--- bluefish-2.0.0/configure.orig 2010-02-15 13:56:55.000000000 +0000 ++++ bluefish-2.0.0/configure 2010-02-16 09:59:41.000000000 +0000 +@@ -25363,6 +25363,89 @@ + fi + + ++{ echo "$as_me:$LINENO: checking for library containing log10" >&5 ++echo $ECHO_N "checking for library containing log10... $ECHO_C" >&6; } ++if test "${ac_cv_search_log10+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char log10 (); ++int ++main () ++{ ++return log10 (); ++ ; ++ return 0; ++} ++_ACEOF ++for ac_lib in '' m; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ ac_cv_search_log10=$ac_res ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_log10+set}" = set; then ++ break ++fi ++done ++if test "${ac_cv_search_log10+set}" = set; then ++ : ++else ++ ac_cv_search_log10=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_search_log10" >&5 ++echo "${ECHO_T}$ac_cv_search_log10" >&6; } ++ac_res=$ac_cv_search_log10 ++if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ ++fi ++ + { echo "$as_me:$LINENO: checking for library containing nanosleep" >&5 + echo $ECHO_N "checking for library containing nanosleep... $ECHO_C" >&6; } + if test "${ac_cv_search_nanosleep+set}" = set; then diff --git a/bluefish-2.0.0-rc3-dso-linking.patch b/bluefish-2.0.0-rc3-dso-linking.patch deleted file mode 100644 index 3a31d15..0000000 --- a/bluefish-2.0.0-rc3-dso-linking.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- bluefish-2.0.0-rc3/configure.ac.orig 2010-01-29 21:13:26.000000000 +0000 -+++ bluefish-2.0.0-rc3/configure.ac 2010-02-15 10:10:30.636430172 +0000 -@@ -541,6 +541,9 @@ - - AC_CHECK_FUNCS_ONCE([regcomp bind socket accept]) - -+# log10 often requires -lm -+AC_SEARCH_LIBS([log10], [m]) -+ - dnl ************************** - dnl Spell checker - dnl ************************** ---- bluefish-2.0.0-rc3/configure.orig 2010-01-29 21:14:03.000000000 +0000 -+++ bluefish-2.0.0-rc3/configure 2010-02-15 10:12:33.631210526 +0000 -@@ -15186,6 +15186,64 @@ - - - -+# log10 often requires -lm -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log10" >&5 -+$as_echo_n "checking for library containing log10... " >&6; } -+if test "${ac_cv_search_log10+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char log10 (); -+int -+main () -+{ -+return log10 (); -+ ; -+ return 0; -+} -+_ACEOF -+for ac_lib in '' m; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_search_log10=$ac_res -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_log10+set}" = set; then : -+ break -+fi -+done -+if test "${ac_cv_search_log10+set}" = set; then : -+ -+else -+ ac_cv_search_log10=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_log10" >&5 -+$as_echo "$ac_cv_search_log10" >&6; } -+ac_res=$ac_cv_search_log10 -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+fi -+ -+ - - - $as_echo "#define WITH_SPC 1" >>confdefs.h diff --git a/bluefish-2.0.0-rc3-projects.patch b/bluefish-2.0.0-rc3-projects.patch deleted file mode 100644 index 8f356bf..0000000 --- a/bluefish-2.0.0-rc3-projects.patch +++ /dev/null @@ -1,162 +0,0 @@ -Index: src/project.c -=================================================================== ---- src/project.c (revision 5723) -+++ src/project.c (working copy) -@@ -321,15 +321,19 @@ - prwin = gui_new_window(prj); - } - tmplist = g_list_last(prj->files); -- while (tmplist) { -- GFile *uri; -- if (strstr ((gchar *) tmplist->data, "://") == NULL) -- uri = g_file_new_for_path((gchar *) tmplist->data); -- else -- uri = g_file_new_for_uri((gchar *) tmplist->data); -- doc_new_from_uri(prwin, uri, NULL, (prj->files->next==NULL), TRUE, -1, -1); -- g_object_unref(uri); -- tmplist = g_list_previous(tmplist); -+ if (tmplist) { -+ while (tmplist) { -+ GFile *uri; -+ if (strstr ((gchar *) tmplist->data, "://") == NULL) -+ uri = g_file_new_for_path((gchar *) tmplist->data); -+ else -+ uri = g_file_new_for_uri((gchar *) tmplist->data); -+ doc_new_from_uri(prwin, uri, NULL, !(prj->files->prev==NULL), TRUE, -1, -1); -+ g_object_unref(uri); -+ tmplist = g_list_previous(tmplist); -+ } -+ } else { -+ doc_new(bfwin, FALSE); - } - DEBUG_MSG("project_open_from_file, new window with files ready at prwin=%p\n",prwin); - setup_bfwin_for_project(prwin); -Index: src/filebrowser2.c -=================================================================== ---- src/filebrowser2.c (revision 5723) -+++ src/filebrowser2.c (working copy) -@@ -1762,11 +1762,21 @@ - case 8: - { - GtkTreePath *fs_path; -+ GtkTreeIter iter; -+ - fs_path = fb2_fspath_from_dir_selection(fb2); - DEBUG_MSG("fb2rpopup_rpopup_action_lcb, fs_path=%p\n", fs_path); - refilter_dirlist(fb2, fs_path); - gtk_tree_path_free(fs_path); -- fb2_focus_document(fb2->bfwin, fb2->bfwin->current_document); -+ if (fb2->bfwin->session->filebrowser_focus_follow) { -+ fb2_focus_document(fb2->bfwin, fb2->bfwin->current_document); -+ } -+ gtk_tree_model_get_iter_first(fb2->dir_tsort, &iter); -+ fs_path = gtk_tree_model_get_path(fb2->dir_tsort, &iter); -+ if(!gtk_tree_view_row_expanded(GTK_TREE_VIEW(fb2->dir_v), fs_path)) { -+ gtk_tree_view_expand_row(GTK_TREE_VIEW(fb2->dir_v), fs_path, FALSE); -+ } -+ gtk_tree_path_free(fs_path); - } - break; - case 9: -Index: data/bflang/diff.bflang2 -=================================================================== ---- data/bflang/diff.bflang2 (revision 5723) -+++ data/bflang/diff.bflang2 (working copy) -@@ -1,9 +1,9 @@ - - - -- -+ -
- - -- -- -- -- -+ -+ -+ - -+ -+ -
- -- -+ - - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - - - -- -+ -
- - -@@ -48,6 +48,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - -@@ -60,7 +66,8 @@ - - - -- -+ -+ - - - diff --git a/bluefish.spec b/bluefish.spec index d1e9a87..4e90ec5 100644 --- a/bluefish.spec +++ b/bluefish.spec @@ -1,6 +1,6 @@ %global pkgver 2.0.0 -%global prerel rc3 -%global rpmrel 4 +#global prerel rc3 +%global rpmrel 1 Name: bluefish Version: %{pkgver} @@ -10,8 +10,7 @@ Group: Development/Tools License: GPLv2+ URL: http://bluefish.openoffice.nl/ Source0: http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}%{?prerel:-%{prerel}}.tar.bz2 -Patch0: bluefish-2.0.0-rc3-projects.patch -Patch1: bluefish-2.0.0-rc3-dso-linking.patch +Patch1: bluefish-2.0.0-dso-linking.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: enchant-devel >= 1.4.2 @@ -66,9 +65,6 @@ Files common to every architecture version of %{name}. %prep %setup -q -n %{name}-%{version}%{?prerel:-%{prerel}} -# Upstream patch resolving some project-related issues (#549552) -%patch0 -p0 - # Function log10 in bftextview2.c requires -lm (#565197) %patch1 -p1 @@ -148,6 +144,11 @@ fi %{_mandir}/man1/%{name}.1* %changelog +* Tue Feb 16 2010 Paul Howarth - 2.0.0-1 +- 2.0.0 release +- Remove upstreamed projects patch +- Update log10 linking patch + * Mon Feb 15 2010 Paul Howarth - 2.0.0-0.4.rc3 - Fix FTBFS due to missing -lm linking for log10 function (#565197) diff --git a/sources b/sources index 68c7fdc..4fcc298 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e42c346da4b232b2ea0469819f4baad2 bluefish-2.0.0-rc3.tar.bz2 +ac9b1e8ef6d5691718a0daa6c78d5618 bluefish-2.0.0.tar.bz2