Update to the latest git

- Build gtk2 also on F-22
This commit is contained in:
Mamoru TASAKA 2015-07-23 17:20:03 +09:00
parent 25df2b7c0b
commit 51c6607193
3 changed files with 18 additions and 13 deletions

1
.gitignore vendored
View File

@ -27,3 +27,4 @@ libfm-0.1.12.tar.gz
/libfm-1.2.3-577806e29d2ec27ce5fee9dc816566fb4e23b155.tar.gz
/libfm-1.2.3-D20150525git8f38f90e04b648637509f2fa2d4208027ae59b5c.tar.gz
/libfm-1.2.3-D20150607gite1de98ccba316605e14d8cfc06df9a55752cdcec.tar.gz
/libfm-1.2.3-D20150713gitf47c9ae7ae7e1c5ff9742b8a6ca49fdb6f55f98d.tar.gz

View File

@ -8,12 +8,12 @@
%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g')
%global usegit 1
%global mainrel 10
%global mainrel 11
%global githash e1de98ccba316605e14d8cfc06df9a55752cdcec
%global githash f47c9ae7ae7e1c5ff9742b8a6ca49fdb6f55f98d
%global shorthash %(TMP=%githash ; echo ${TMP:0:10})
%global gitdate Sun, 7 Jun 2015 02:02:49 +0900
%global gitdate_num 20150607
%global gitdate Mon, 13 Jul 2015 18:39:35 +0300
%global gitdate_num 20150713
%if 0%{?usegit} >= 1
%global fedorarel %{mainrel}.D%{gitdate_num}git%{shorthash}
@ -44,7 +44,7 @@ Patch1000: http://sourceforge.net/p/pcmanfm/feature-requests/_discuss/threa
BuildRequires: libexif-devel
BuildRequires: gtk3-devel
%if 0%{?fedora} >= 23
%if 0%{?fedora} >= 22
BuildRequires: gtk2-devel
%endif
BuildRequires: menu-cache-devel >= 0.3.2
@ -180,7 +180,7 @@ This package containg development documentation files for %{name}.
#%%patch0 -p1 -b .orig
%setup -q -n %{name}-%{githash}
%if 0%{?fedora} >= 23
%if 0%{?fedora} >= 22
%patch1000 -p1
%endif
@ -195,7 +195,7 @@ sed -i.libdir_syssearch \
%build
for ver in \
%if 0%{?fedora} >= 23
%if 0%{?fedora} >= 22
2 \
%endif
3 \
@ -252,7 +252,7 @@ do
done
# GTK2
%if 0%{?fedora} >= 23
%if 0%{?fedora} >= 22
pushd INSTDIR-gtk2
find . -name '*.la' -exec rm -f {} ';'
@ -297,7 +297,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%post gtk -p /sbin/ldconfig
%postun gtk -p /sbin/ldconfig
%if %{?fedora} >= 23
%if %{?fedora} >= 22
%post gtk2 -p /sbin/ldconfig
%postun gtk2 -p /sbin/ldconfig
%endif
@ -324,7 +324,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%files gtk
%{_libdir}/%{name}-gtk3.so.4*
%{_datadir}/libfm/
%if 0%{?fedora} < 23
%if 0%{?fedora} < 22
%{_libdir}/libfm/modules/gtk-*.so
%else
%{_libdir}/libfm/modules/gtk3/
@ -355,7 +355,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_libdir}/%{name}-gtk3.so
%{_libdir}/pkgconfig/libfm-gtk3.pc
%if 0%{?fedora} >= 23
%if 0%{?fedora} >= 22
%files gtk2
%{_libdir}/%{name}-gtk.so.4*
%{_libdir}/libfm/modules/gtk/
@ -373,7 +373,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%endif
%changelog
* Wed Jun 17 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.2.3-10D20150607gite1de98ccba
* Thu Jul 23 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.2.3-11.D20150713gitf47c9ae7ae
- Update to the latest git
- Build gtk2 also on F-22
* Wed Jun 17 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.2.3-10.D20150607gite1de98ccba
- F-23: build also gtk2 library
- Move data files to main package

View File

@ -1 +1 @@
bb591d5f83aae4672c38f555bd10c20b libfm-1.2.3-D20150607gite1de98ccba316605e14d8cfc06df9a55752cdcec.tar.gz
5dd13c5ad357ff9b40c87d970d140761 libfm-1.2.3-D20150713gitf47c9ae7ae7e1c5ff9742b8a6ca49fdb6f55f98d.tar.gz