[libfm] 1.2.0 rc1

Mon Feb 10 17:36:24 UTC 2014

commit b6f45669d4f5c30666c4b440377b0cd6000a7798
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Tue Feb 11 02:36:10 2014 +0900

    1.2.0 rc1
    
    - Split out executable binaries into gtk-utils

 .gitignore                                        |    1 +
 libfm-1.2.0-rc1-lxshortcut-garbage-help-msg.patch |   11 +++
 libfm.spec                                        |   81 ++++++++++++++-------
 sources                                           |    2 +-
 4 files changed, 66 insertions(+), 29 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index e53c306..dd80160 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ libfm-0.1.12.tar.gz
 /libfm-1.1.2.2.tar.gz
 /libfm-1.1.3.tar.xz
 /libfm-1.1.4.tar.xz
+/libfm-1.2.0-rc1.tar.xz
diff --git a/libfm-1.2.0-rc1-lxshortcut-garbage-help-msg.patch b/libfm-1.2.0-rc1-lxshortcut-garbage-help-msg.patch
new file mode 100644
index 0000000..1fef8c3
--- /dev/null
+++ b/libfm-1.2.0-rc1-lxshortcut-garbage-help-msg.patch
@@ -0,0 +1,11 @@
+--- libfm-1.2.0-rc1/src/tools/lxshortcut.c.gettext	2013-12-06 00:05:58.000000000 +0900
++++ libfm-1.2.0-rc1/src/tools/lxshortcut.c	2014-02-11 02:14:03.000000000 +0900
+@@ -111,7 +111,7 @@ int main(int argc, char **argv)
+     }
+ 
+     /* initialize GTK+ and parse the command line arguments */
+-    if (G_UNLIKELY(!gtk_init_with_args(&argc, &argv, "", opt_entries, GETTEXT_PACKAGE, &err)))
++    if (G_UNLIKELY(!gtk_init_with_args(&argc, &argv, " ", opt_entries, GETTEXT_PACKAGE, &err)))
+     {
+         g_print("Error: %s\n", err->message);
+         return 1;
diff --git a/libfm.spec b/libfm.spec
index ad25348..d844777 100644
--- a/libfm.spec
+++ b/libfm.spec
@@ -3,6 +3,10 @@
 # Upstream git:
 # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/libfm
 
+%global         mainver     1.2.0
+%global         prever      -rc1
+%global         prerpmver    %(echo "%{?prever}" | sed -e 's|-||g')
+
 %global         usegit      0
 %global         mainrel     1
 
@@ -14,13 +18,13 @@
 %if 0%{?usegit} >= 1
 %global         fedorarel   %{mainrel}.D%{gitdate_num}git%{shorthash}
 %else
-%global         fedorarel   %{mainrel}
+%global         fedorarel   %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}
 %endif
 
 %global         build_doc   1
 
 Name:           libfm
-Version:        1.1.4
+Version:        %{mainver}
 Release:        %{fedorarel}%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
@@ -30,12 +34,13 @@ URL:            http://pcmanfm.sourceforge.net/
 %if 0%{?usegit} >= 1
 Source0:        %{name}-%{version}-D%{gitdate_num}git%{shorthash}.tar.gz
 %else
-Source0:        http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.xz
+Source0:        http://downloads.sourceforge.net/pcmanfm/%{name}-%{mainver}%{?prever}.tar.xz
 %endif
-# From git head e2f4578bd5e89c7a1 data/libfm-pref-apps.desktop.in
-Source1:        libfm-pref-apps.desktop.in
 # Fedora specific patches
-Patch0:         libfm-0.1.9-pref-apps.patch
+# Firefox uses firefox.desktop for desktop name, drop
+#Patch0:         libfm-0.1.9-pref-apps.patch
+# https://sourceforge.net/p/pcmanfm/bugs/825/
+Patch0:         libfm-1.2.0-rc1-lxshortcut-garbage-help-msg.patch
 
 BuildRequires:  libexif-devel
 BuildRequires:  gtk3-devel
@@ -45,12 +50,10 @@ BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
 
-BuildRequires:	gtk-doc
-BuildRequires: libxslt
+BuildRequires:  gtk-doc
+BuildRequires:  libxslt
 
-%if 0%{?fedora} >= 18
-BuildRequires:	dbus-glib-devel
-%endif
+BuildRequires:  dbus-glib-devel
 
 BuildRequires:  vala
 
@@ -87,6 +90,18 @@ file systems supported by gvfs.
 
 This package provides useful file manager-related GTK+ widgets.
 
+%package        gtk-utils
+Summary:        GTK+ related utility package for %{name}
+Group:          User Interface/Desktops
+Requires:       %{name}-gtk%{?isa} = %{version}-%{release}
+Obsoletes:      lxshortcut < 0.1.3
+Provides:       lxshortcut = %{version}-%{release}
+Provides:       lxshortcut%{?_isa} = %{version}-%{release}
+
+%description    gtk-utils
+This package contains some GTK+ related utility files for
+%{name}.
+
 
 %package        devel
 Summary:        Development files for %{name}
@@ -117,14 +132,9 @@ This package containg development documentation files for %{name}.
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .orig
-
-install -cpm 644 %{SOURCE1} data/
-
-# ???
-#mkdir m4 || :
-#sh autogen.sh
+%setup -q -n %{name}-%{version}%{?prever}
+#%%patch0 -p1 -b .orig
+%patch0 -p1 -b .gettext
 
 # treak rpath
 sed -i.libdir_syssearch \
@@ -139,6 +149,7 @@ sed -i.libdir_syssearch \
 %if 0
     --enable-demo \
 %endif
+	--disable-silent-rules \
     --disable-static
 
 # To show translation status
@@ -161,7 +172,7 @@ echo '%%defattr(-,root,root,-)' > gtk-header.files
 for f in $RPM_BUILD_ROOT%_includedir/%name-1.0/*.h
 do
   bf=$(basename $f)
-  for dir in actions base job
+  for dir in actions base job extra .
   do
     if [ -f src/$dir/$bf ]
     then
@@ -201,26 +212,36 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-# FIXME: Add ChangeLog and NEWS if not empty
+# FIXME: Add ChangeLog if not empty
 %doc AUTHORS
 %doc COPYING
+%doc NEWS
 %doc README
 %dir %{_sysconfdir}/xdg/libfm/
-%config(noreplace) %{_sysconfdir}/xdg/libfm/pref-apps.conf
 %config(noreplace) %{_sysconfdir}/xdg/libfm/libfm.conf
-%{_libdir}/%{name}.so.3*
+%{_libdir}/%{name}.so.4*
+%{_libdir}/%{name}-extra.so.4*
+%dir %{_libdir}/libfm
+%dir %{_libdir}/libfm/modules
+%{_libdir}/libfm/modules/vfs-*.so
 %{_datadir}/mime/packages/libfm.xml
 
 
 %files gtk
-%defattr(-,root,root,-)
-%{_mandir}/man1/libfm-pref-apps.1.*
-%{_bindir}/libfm-pref-apps
-%{_libdir}/%{name}-gtk3.so.3*
+%{_libdir}/%{name}-gtk3.so.4*
 #%%dir %%{_libdir}/libfm/
 #%%{_libdir}/libfm/gnome-terminal
 %{_datadir}/libfm/
+%{_libdir}/libfm/modules/gtk-*.so
+
+%files gtk-utils
+%defattr(-,root,root,-)
+%{_mandir}/man1/libfm-pref-apps.1.*
+%{_mandir}/man1/lxshortcut.1.*
+%{_bindir}/libfm-pref-apps
+%{_bindir}/lxshortcut
 %{_datadir}/applications/libfm-pref-apps.desktop
+%{_datadir}/applications/lxshortcut.desktop
 
 
 %files devel -f base-header.files
@@ -228,8 +249,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %doc TODO
 %{_includedir}/libfm
 %dir %{_includedir}/libfm-1.0/
-%{_includedir}/libfm-1.0/fm.h
 %{_libdir}/%{name}.so
+%{_libdir}/%{name}-extra.so
 %{_libdir}/pkgconfig/libfm.pc
 
 %files gtk-devel -f gtk-header.files
@@ -247,6 +268,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %endif
 
 %changelog
+* Mon Feb 10 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.2.0-0.1.rc1
+- 1.2.0 rc1
+- Split out executable binaries into gtk-utils
+
 * Tue Dec 10 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.1.4-1
 - 1.1.4
  
diff --git a/sources b/sources
index 756b3d1..4aab153 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd3ff9174e097ab3fd619e4a10fd822a  libfm-1.1.4.tar.xz
+31c925c512a9d54cc6087d0ecb6784e4  libfm-1.2.0-rc1.tar.xz
