mtasaka pushed to libfm (f21). "Again try the latest git"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu May 21 14:33:33 UTC 2015
From a2772292b6738128caa0ee2d23860882aa4c926a Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Thu, 21 May 2015 23:32:44 +0900
Subject: Again try the latest git
diff --git a/.gitignore b/.gitignore
index 60f5afc..15fabd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ libfm-0.1.12.tar.gz
/libfm-1.2.2.tar.xz
/libfm-1.2.3.tar.xz
/libfm-1.2.3-699810d3bd0c5d9d508fcd9aa3a65442f2afee3f.tar.gz
+/libfm-1.2.3-577806e29d2ec27ce5fee9dc816566fb4e23b155.tar.gz
diff --git a/0001-make-libfm-pref-apps-work-with-GTK-3.10.patch b/0001-make-libfm-pref-apps-work-with-GTK-3.10.patch
deleted file mode 100644
index 01b94cc..0000000
--- a/0001-make-libfm-pref-apps-work-with-GTK-3.10.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 39e6c8420e0016cbc2a60ec7d431b0a6aec30496 Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka at fedoraproject.org>
-Date: Thu, 21 May 2015 19:49:04 +0900
-Subject: [PATCH] make libfm-pref-apps work with GTK 3.10+
-
-Use gtk_builder_new_from_file supported on GTK 3.10+.
-has_separator property is no longer supported so just
-drop this.
----
- data/ui/preferred-apps.glade | 1 -
- src/tools/libfm-pref-apps.c | 4 ++++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/data/ui/preferred-apps.glade b/data/ui/preferred-apps.glade
-index 84f26b5..327cb63 100644
---- a/data/ui/preferred-apps.glade
-+++ b/data/ui/preferred-apps.glade
-@@ -7,7 +7,6 @@
- <property name="title" translatable="yes">Preferred Applications</property>
- <property name="window_position">center</property>
- <property name="type_hint">normal</property>
-- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
-diff --git a/src/tools/libfm-pref-apps.c b/src/tools/libfm-pref-apps.c
-index 584b587..dbdb59b 100644
---- a/src/tools/libfm-pref-apps.c
-+++ b/src/tools/libfm-pref-apps.c
-@@ -47,8 +47,12 @@ int main(int argc, char** argv)
- gtk_init(&argc, &argv);
- fm_gtk_init(NULL);
-
-+#if GTK_CHECK_VERSION(3, 10, 0)
-+ b = gtk_builder_new_from_file(PACKAGE_UI_DIR "/preferred-apps.ui");
-+#else
- b = gtk_builder_new();
- gtk_builder_add_from_file(b, PACKAGE_UI_DIR "/preferred-apps.ui", NULL);
-+#endif
- dlg = GTK_DIALOG(gtk_builder_get_object(b, "dlg"));
- browser = GTK_COMBO_BOX(gtk_builder_get_object(b, "browser"));
- mail_client = GTK_COMBO_BOX(gtk_builder_get_object(b, "mail_client"));
---
-2.1.0
-
diff --git a/libfm.spec b/libfm.spec
index e8f0e75..a7e709d 100644
--- a/libfm.spec
+++ b/libfm.spec
@@ -8,12 +8,12 @@
%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g')
%global usegit 1
-%global mainrel 3
+%global mainrel 4
-%global githash 699810d3bd0c5d9d508fcd9aa3a65442f2afee3f
+%global githash 577806e29d2ec27ce5fee9dc816566fb4e23b155
%global shorthash %(TMP=%githash ; echo ${TMP:0:10})
-%global gitdate Tue, 19 May 2015 20:18:05 +0300
-%global gitdate_num 20150519
+%global gitdate Thu, 21 May 2015 21:12:05 +0900
+%global gitdate_num 20150521
%if 0%{?usegit} >= 1
%global fedorarel %{mainrel}.D%{gitdate_num}git%{shorthash}
@@ -32,14 +32,13 @@ Group: System Environment/Libraries
License: GPLv2+
URL: http://pcmanfm.sourceforge.net/
%if 0%{?usegit} >= 1
-Source0: https://github.com/lxde/libfm/archive/%{name}-%{version}-%{githash}.tar.gz
+Source0: https://github.com/lxde/libfm/archive/%{githash}/%{name}-%{version}-%{githash}.tar.gz
%else
Source0: http://downloads.sourceforge.net/pcmanfm/%{name}-%{mainver}%{?prever}.tar.xz
%endif
# Fedora specific patches
# Firefox uses firefox.desktop for desktop name, drop
#Patch0: libfm-0.1.9-pref-apps.patch
-Patch10: 0001-make-libfm-pref-apps-work-with-GTK-3.10.patch
BuildRequires: libexif-devel
BuildRequires: gtk3-devel
@@ -139,7 +138,6 @@ This package containg development documentation files for %{name}.
#%%setup -q -n %{name}-%{version}%{?prever}
#%%patch0 -p1 -b .orig
%setup -q -n %{name}-%{githash}
-%patch10 -p1
%if 0%{?usegit} >= 1
sh autogen.sh
@@ -284,6 +282,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%endif
%changelog
+* Thu May 21 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.2.3-4.D20150521git577806e29d
+- Again try the latest git
+
* Thu May 21 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.2.3-3.D20150519git699810d3bd
- Make libfm-pref-apps work
diff --git a/sources b/sources
index 903d3d3..4859707 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c11660e936730628d8ca98a86cb32cd libfm-1.2.3-699810d3bd0c5d9d508fcd9aa3a65442f2afee3f.tar.gz
+e547de78613e444ba47d2a68e3da93b5 libfm-1.2.3-577806e29d2ec27ce5fee9dc816566fb4e23b155.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/libfm.git/commit/?h=f21&id=a2772292b6738128caa0ee2d23860882aa4c926a
More information about the scm-commits
mailing list