mtasaka pushed to libfm (f20). "Try latest git (2015-05-19)"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu May 21 11:01:25 UTC 2015


From 46c268b8313c82f6bc1b14e83d33ca9750ec0347 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Thu, 21 May 2015 18:25:23 +0900
Subject: Try latest git (2015-05-19)


diff --git a/.gitignore b/.gitignore
index b4e7949..60f5afc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ libfm-0.1.12.tar.gz
 /libfm-1.2.1.tar.xz
 /libfm-1.2.2.tar.xz
 /libfm-1.2.3.tar.xz
+/libfm-1.2.3-699810d3bd0c5d9d508fcd9aa3a65442f2afee3f.tar.gz
diff --git a/libfm.spec b/libfm.spec
index 0c182ff..7c78612 100644
--- a/libfm.spec
+++ b/libfm.spec
@@ -7,13 +7,13 @@
 %undefine         prever
 %global         prerpmver    %(echo "%{?prever}" | sed -e 's|-||g')
 
-%global         usegit      0
-%global         mainrel     1
+%global         usegit      1
+%global         mainrel     2
 
-%global         githash     e2f4578bd5e89c7a12eae19abd8df7f9f599d115
+%global         githash     699810d3bd0c5d9d508fcd9aa3a65442f2afee3f
 %global         shorthash   %(TMP=%githash ; echo ${TMP:0:10})
-%global         gitdate     Sun Aug 11 00:44:03 2013 +0300
-%global         gitdate_num 20130811
+%global         gitdate     Tue, 19 May 2015 20:18:05 +0300
+%global         gitdate_num 20150519
 
 %if 0%{?usegit} >= 1
 %global         fedorarel   %{mainrel}.D%{gitdate_num}git%{shorthash}
@@ -32,7 +32,7 @@ Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://pcmanfm.sourceforge.net/
 %if 0%{?usegit} >= 1
-Source0:        %{name}-%{version}-D%{gitdate_num}git%{shorthash}.tar.gz
+Source0:        https://github.com/lxde/libfm/archive/%{name}-%{version}-%{githash}.tar.gz
 %else
 Source0:        http://downloads.sourceforge.net/pcmanfm/%{name}-%{mainver}%{?prever}.tar.xz
 %endif
@@ -55,6 +55,11 @@ BuildRequires:  dbus-glib-devel
 
 BuildRequires:  vala
 
+%if 0%{?usegit} >= 1
+BuildRequires:  automake
+BuildRequires:		libtool
+%endif
+
 %if 0%{?build_doc} < 1
 Obsoletes:      %{name}-devel-docs < 0.1.15
 %endif
@@ -130,8 +135,13 @@ This package containg development documentation files for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever}
+#%%setup -q -n %{name}-%{version}%{?prever}
 #%%patch0 -p1 -b .orig
+%setup -q -n %{name}-%{githash}
+
+%if 0%{?usegit} >= 1
+sh autogen.sh
+%endif
 
 # treak rpath
 sed -i.libdir_syssearch \
@@ -272,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-2.D20150519git699810d3bd
+- Try latest git (2015-05-19)
+
 * Fri Oct 17 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.2.3-1
 - 1.2.3
 
diff --git a/sources b/sources
index d35bf7b..903d3d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ff38200701658f7e80e25ed395d92dd  libfm-1.2.3.tar.xz
+6c11660e936730628d8ca98a86cb32cd  libfm-1.2.3-699810d3bd0c5d9d508fcd9aa3a65442f2afee3f.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libfm.git/commit/?h=f20&id=46c268b8313c82f6bc1b14e83d33ca9750ec0347


More information about the scm-commits mailing list