From 92694c4bbd54e5800a97a23f901ffce511deb1a6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Nov 04 2014 05:14:00 +0000 Subject: 0.8.0 --- diff --git a/.gitignore b/.gitignore index 1681dc2..8a5069e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pcmanfm-qt-0.1.0-Source.tar.bz2 +/pcmanfm-qt-0.8.0.tar.gz diff --git a/pcmanfm-qt-0.1.0-libfm120-icontheme.patch b/pcmanfm-qt-0.1.0-libfm120-icontheme.patch deleted file mode 100644 index 015b3ca..0000000 --- a/pcmanfm-qt-0.1.0-libfm120-icontheme.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b467d4f96bd1d5525f59186551196fd5964c56b8 Mon Sep 17 00:00:00 2001 -From: "Hone Jen Yee (PCMan)" -Date: Tue, 6 Aug 2013 16:16:09 +0800 -Subject: [PATCH] Adopt recent changes of libfm. FmIcon is essentially - identical to GIcon now. - ---- - libfm-qt/icontheme.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libfm-qt/icontheme.cpp b/libfm-qt/icontheme.cpp -index 3c4e660..daf3017 100644 ---- a/libfm-qt/icontheme.cpp -+++ b/libfm-qt/icontheme.cpp -@@ -83,7 +83,7 @@ QIcon IconTheme::icon(FmIcon* fmicon) { - QIcon* picon = reinterpret_cast(fm_icon_get_user_data(fmicon)); - if(!picon) { // we don't have a cache yet - picon = new QIcon(); // what a waste! -- *picon = convertFromGIcon(fmicon->gicon); -+ *picon = convertFromGIcon(G_ICON(fmicon)); - fm_icon_set_user_data(fmicon, picon); // store it in FmIcon - } - return *picon; --- -1.8.5.1 - diff --git a/pcmanfm-qt.spec b/pcmanfm-qt.spec index 7a30a69..d566815 100644 --- a/pcmanfm-qt.spec +++ b/pcmanfm-qt.spec @@ -1,20 +1,24 @@ Name: pcmanfm-qt -Version: 0.1.0 -Release: 7%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Qt port of the LXDE file manager PCManFM License: GPLv2+ -URL: http://pcmanfm.sourceforge.net/ -Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}-Source.tar.bz2 -# https://github.com/lxde/pcmanfm-qt/commit/b467d4f96bd1d5525f59186551196fd5964c56b8.patch +URL: https://github.com/lxde/pcmanfm-qt +# https://github.com/lxde/pcmanfm-qt/archive/%%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz Patch0: pcmanfm-qt-0.1.0-libfm120-icontheme.patch BuildRequires: cmake BuildRequires: desktop-file-utils -BuildRequires: glib2-devel -BuildRequires: libfm-devel >= 1.1.0 -BuildRequires: libX11-devel -BuildRequires: qt-devel +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(QtDBus) +BuildRequires: pkgconfig(libmenu-cache) Requires: libfm-qt%{?_isa} = %{version}-%{release} %description @@ -36,8 +40,7 @@ libfm-qt-devel package contains libraries and header files for developing applications that use libfm-qt. %prep -%setup -q -n %{name}-%{version}-Source -%patch0 -p1 -b .libfm120 +%setup -q # Honor %%optflags sed -i.flags \ @@ -70,11 +73,6 @@ do desktop-file-validate $f done -#??? -pushd %{buildroot}/%{_libdir} -ln -sf libfm-qt.so.0{.0.0,} -popd - %post -n libfm-qt -p /sbin/ldconfig %postun -n libfm-qt -p /sbin/ldconfig @@ -93,13 +91,15 @@ update-desktop-database &> /dev/null || : %{_datadir}/applications/%{name}*.desktop %{_datadir}/%{name}/ +%{_mandir}/man1/%{name}.1* + %files -n libfm-qt # Also include same document files %doc AUTHORS %doc COPYING %doc README -%{_libdir}/libfm-qt.so.0* +%{_libdir}/libfm-qt.so.1* %{_datadir}/libfm-qt/ %files -n libfm-qt-devel @@ -108,6 +108,9 @@ update-desktop-database &> /dev/null || : %{_includedir}/libfm-qt/ %changelog +* Tue Nov 4 2014 Mamoru TASAKA - 0.8.0-1 +- 0.8.0 + * Sun Aug 17 2014 Fedora Release Engineering - 0.1.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index a50ecad..b70490d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26468c4929bbeb92bd60c938d75f0758 pcmanfm-qt-0.1.0-Source.tar.bz2 +4af3f6c26d60da2d337250f18ab23270 pcmanfm-qt-0.8.0.tar.gz