[wkhtmltopdf] Update to the latest git
Mamoru TASAKA
mtasaka at fedoraproject.org
Wed Nov 26 07:27:43 UTC 2014
commit 805677d917260d6f4b58cf941efbeda2dbb07dc6
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Wed Nov 26 16:27:39 2014 +0900
Update to the latest git
.gitignore | 1 +
sources | 2 +-
wkhtmltopdf.spec | 27 ++++++++++++++++++++++++---
3 files changed, 26 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 95a2ab9..1cc0e17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/wkhtmltopdf-0.11.0_rc1.tar.bz2
/wkhtmltopdf-0.12.0.tar.gz
/wkhtmltopdf-0.12.1.tar.gz
+/wkhtmltopdf-5dea2532977e5e9fbcb8da7aa3bd399b257096f4.tar.gz
diff --git a/sources b/sources
index 8beef54..1c4cf63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c45d22a1001c6692c6e68b3452dff409 wkhtmltopdf-0.12.1.tar.gz
+3614b556e194339aec02993ccfb863ed wkhtmltopdf-5dea2532977e5e9fbcb8da7aa3bd399b257096f4.tar.gz
diff --git a/wkhtmltopdf.spec b/wkhtmltopdf.spec
index 2e86d4d..6c726cc 100644
--- a/wkhtmltopdf.spec
+++ b/wkhtmltopdf.spec
@@ -1,5 +1,9 @@
-%global mainver 0.12.1
-#%%global minorver rc1
+%global githash 5dea2532977e5e9fbcb8da7aa3bd399b257096f4
+%global shorthash %(c=%{githash}; echo ${c:0:7})
+
+%global mainver 0.12.2
+%global minorver dev%{shorthash}
+%global usegitsource 1
%global fedorarel 1
@@ -13,7 +17,8 @@ URL: http://wkhtmltopdf.org/
#Source0: http://wkhtmltopdf.googlecode.com/files/%{name}-%{mainver}%{?minorver:_%minorver}.tar.bz2
# https://github.com/wkhtmltopdf/wkhtmltopdf/archive/%%{version}.tar.gz
# Renamed above
-Source0: %{name}-%{version}.tar.gz
+#Source0: %{name}-%{version}.tar.gz
+Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{githash}.tar.gz
BuildRequires: qtwebkit-devel%{?isa}
@@ -32,7 +37,12 @@ The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
+%if 0%{?usegitsource} >= 1
+%setup -q -c -T -a 0
+cd %{name}-*/
+%else
%setup -q -n %{name}-%{mainver}%{?minorver:_%minorver}
+%endif
# libdir handling.. better handling needed
sed -i.lib -e \
'/INSTALLBASE/s|lib|%{_lib}|' \
@@ -44,10 +54,18 @@ touch -r AUTHORS{.bom,}
rm -f AUTHORS.bom
%build
+%if 0%{?usegitsource} >= 1
+cd %{name}-*/
+%endif
%{_qt4_qmake}
make %{_smp_mflags}
%install
+%if 0%{?usegitsource} >= 1
+cd %{name}-*/
+cp -a [A-Z]* examples/ ..
+%endif
+
make install \
INSTALL_ROOT=%{buildroot}%{_prefix}
@@ -76,6 +94,9 @@ make install \
%changelog
+* Thu Nov 26 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.12.2-0.1.dev5dea253
+- Update to the latest git
+
* Wed Aug 27 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.12.1-1
- 0.12.1
More information about the scm-commits
mailing list