diff --git a/.gitignore b/.gitignore index 00d38e2..9c60138 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ libfm-0.1.12.tar.gz /libfm-0.1.16.tar.gz /libfm-0.1.17.tar.gz /libfm-1.0.tar.gz +/libfm-1.0.1.tar.gz diff --git a/libfm-1.0.1-dsolink-tests.patch b/libfm-1.0.1-dsolink-tests.patch new file mode 100644 index 0000000..0c60c77 --- /dev/null +++ b/libfm-1.0.1-dsolink-tests.patch @@ -0,0 +1,9 @@ +--- libfm-1.0.1/src/tests/Makefile.am.dso 2012-09-27 15:45:02.621895881 +0900 ++++ libfm-1.0.1/src/tests/Makefile.am 2012-09-27 15:45:38.451173597 +0900 +@@ -19,5 +19,6 @@ + TEST_PROGS += fm-path + fm_path_SOURCES = test-fm-path.c + fm_path_LDADD= \ ++ $(GIO_LIBS) \ + ../libfm.la \ + $(NULL) diff --git a/libfm.spec b/libfm.spec index 0030821..9073f47 100644 --- a/libfm.spec +++ b/libfm.spec @@ -20,7 +20,7 @@ %global build_doc 1 Name: libfm -Version: 1.0 +Version: 1.0.1 Release: %{fedorarel}%{?dist} Summary: GIO-based library for file manager-like programs @@ -34,6 +34,8 @@ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar. %endif # Fedora specific patches Patch0: libfm-0.1.9-pref-apps.patch +# Fix dso linkage +Patch1: libfm-1.0.1-dsolink-tests.patch BuildRequires: libexif-devel BuildRequires: gtk2-devel >= 2.16.0 @@ -43,6 +45,15 @@ BuildRequires: gettext BuildRequires: intltool BuildRequires: desktop-file-utils +# Patch1 +BuildRequires: automake +BuildRequires: libtool +BuildRequires: gtk-doc + +%if 0%{?fedora} >= 18 +BuildRequires: dbus-glib-devel +%endif + BuildRequires: vala %if 0%{?build_doc} < 1 @@ -110,6 +121,9 @@ This package containg development documentation files for %{name}. %prep %setup -q %patch0 -p1 -b .orig +%patch1 -p1 -b .dso +# Patch1 +autoreconf -fi # ??? #mkdir m4 || : @@ -122,6 +136,9 @@ sed -i.libdir_syssearch \ %build %configure \ +%if 0%{?fedora} >= 18 + --enable-udisks \ +%endif --disable-static # To show translation status make -C po -j1 GMSGFMT="msgfmt --statistics" @@ -203,7 +220,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/%{name}.so %{_libdir}/pkgconfig/libfm.pc - %files gtk-devel -f gtk-header.files %defattr(-,root,root,-) %{_includedir}/libfm/libfm/fm-gtk.h @@ -219,6 +235,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %endif %changelog +* Wed Sep 27 2012 Mamoru Tasaka - 1.0.1-1 +- 1.0.1 + * Wed Aug 15 2012 Mamoru Tasaka - 1.0-1 - 1.0 release diff --git a/sources b/sources index 86072b4..c4eed6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f978eb58c72a6623021504832a9da1b libfm-1.0.tar.gz +7fb406f38f99c9171661f72fa6d4da7f libfm-1.0.1.tar.gz