From a95c0062f190a41c42f554c155901d28e0318638 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 15 Aug 2012 00:57:31 +0900 Subject: [PATCH 1/3] 1.0 release --- libfm.spec | 41 ++++++++++++++++------------------------- sources | 2 +- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/libfm.spec b/libfm.spec index dce5342..0030821 100644 --- a/libfm.spec +++ b/libfm.spec @@ -20,8 +20,8 @@ %global build_doc 1 Name: libfm -Version: 0.1.17 -Release: %{fedorarel}%{?dist}.2 +Version: 1.0 +Release: %{fedorarel}%{?dist} Summary: GIO-based library for file manager-like programs Group: System Environment/Libraries @@ -35,15 +35,15 @@ Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar. # Fedora specific patches Patch0: libfm-0.1.9-pref-apps.patch +BuildRequires: libexif-devel BuildRequires: gtk2-devel >= 2.16.0 BuildRequires: menu-cache-devel >= 0.3.2 + BuildRequires: gettext BuildRequires: intltool BuildRequires: desktop-file-utils -# For Patch1 -BuildRequires: automake -BuildRequires: libtool -BuildRequires: gtk-doc + +BuildRequires: vala %if 0%{?build_doc} < 1 Obsoletes: %{name}-devel-docs < 0.1.15 @@ -111,22 +111,10 @@ This package containg development documentation files for %{name}. %setup -q %patch0 -p1 -b .orig -# Remove -DG_DISABLE_DEPRECATED for G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME -# on GLib <= 2.27 -%if 0%{?fedora} < 15 -sed -i.deprecated \ - -e '\@-DG_DISABLE_DEPRECATED@d' \ - src/Makefile.am -%endif - # ??? #mkdir m4 || : #sh autogen.sh -# ??? -mkdir -p docs/reference/libfm -touch docs/{reference{/libfm/,},}/Makefile.in - # treak rpath sed -i.libdir_syssearch \ -e '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \ @@ -153,7 +141,7 @@ echo '%%defattr(-,root,root,-)' > gtk-header.files for f in $RPM_BUILD_ROOT%_includedir/%name/%name/*.h do bf=$(basename $f) - for dir in base job + for dir in actions base job do if [ -f src/$dir/$bf ] then @@ -185,21 +173,21 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) # FIXME: Add ChangeLog and NEWS if not empty -%doc AUTHORS COPYING README +%doc AUTHORS +%doc COPYING +%doc README %dir %{_sysconfdir}/xdg/libfm/ %config(noreplace) %{_sysconfdir}/xdg/libfm/pref-apps.conf %config(noreplace) %{_sysconfdir}/xdg/libfm/libfm.conf -%{_libdir}/%{name}.so.* -%if 0%{?fedora} < 15 -%{_libdir}/gio/modules/libgiofm.so -%endif +%{_libdir}/%{name}.so.3* %{_datadir}/mime/packages/libfm.xml %files gtk %defattr(-,root,root,-) +%{_mandir}/man1/libfm-pref-apps.1.* %{_bindir}/libfm-pref-apps -%{_libdir}/%{name}-gtk.so.* +%{_libdir}/%{name}-gtk.so.3* #%%dir %{_libdir}/libfm/ #%%{_libdir}/libfm/gnome-terminal %{_datadir}/libfm/ @@ -231,6 +219,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %endif %changelog +* Wed Aug 15 2012 Mamoru Tasaka - 1.0-1 +- 1.0 release + * Thu Jul 19 2012 Fedora Release Engineering - 0.1.17-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 2884041..86072b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a97e03d973e6ac727f28d0934d6c9ad5 libfm-0.1.17.tar.gz +9f978eb58c72a6623021504832a9da1b libfm-1.0.tar.gz From 3f44194807de7ca4500151093b1c20b9617bc79b Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 15 Aug 2012 00:59:20 +0900 Subject: [PATCH 2/3] reupload tarball --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e603617..00d38e2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ libfm-0.1.12.tar.gz /libfm-0.1.15-D20110807gitd22b41fd2f.tar.gz /libfm-0.1.16.tar.gz /libfm-0.1.17.tar.gz +/libfm-1.0.tar.gz From fd4d07786808fddbb803f31d983524612ad0a5c2 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 27 Sep 2012 17:45:51 +0900 Subject: [PATCH 3/3] 1.0.1 --- .gitignore | 1 + libfm-1.0.1-dsolink-tests.patch | 9 +++++++++ libfm.spec | 23 +++++++++++++++++++++-- sources | 2 +- 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 libfm-1.0.1-dsolink-tests.patch 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