mkrizek pushed to yourls (f21). "Update to the latest master from git (abc7d6c)"

[notifications at fedoraproject.org]

>From c8e314ca7e65b78c9e234b8fcbb394ea7ba09335 Mon Sep 17 00:00:00 2001
From: Martin Krizek <mkrizek at redhat.com>
Date: Fri, 10 Apr 2015 11:05:14 +0200
Subject: Update to the latest master from git (abc7d6c)


diff --git a/.gitignore b/.gitignore
index 4f04b33..0ab2225 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /yourls-1.5.1.zip
 /YOURLS-1.6.tar.gz
 /YOURLS-1.7.tar.gz
+/YOURLS-abc7d6c52f6e0ddb8d930d3022f75b46617ee0d8.tar.gz
diff --git a/0001-Don-t-check-for-new-version-when-updating-or-install.patch b/0001-Don-t-check-for-new-version-when-updating-or-install.patch
deleted file mode 100644
index fe36519..0000000
--- a/0001-Don-t-check-for-new-version-when-updating-or-install.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 84ee498d45e8bc94d85f2f79a4d48f11194c9352 Mon Sep 17 00:00:00 2001
-From: ozh <ozh at ozh.org>
-Date: Sat, 1 Feb 2014 17:49:15 +0100
-Subject: [PATCH] Don't check for new version when updating or installing.
-
-Fixes #1617.
----
- includes/load-yourls.php | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/includes/load-yourls.php b/includes/load-yourls.php
-index e808835..c2704a6 100644
---- a/includes/load-yourls.php
-+++ b/includes/load-yourls.php
-@@ -179,7 +179,9 @@
- yourls_do_action( 'plugins_loaded' );
- 
- // Is there a new version of YOURLS ?
--yourls_new_core_version_notice();
-+if( yourls_is_installed() && !yourls_is_upgrading() ) {
-+    yourls_new_core_version_notice();
-+}
- 
- if( yourls_is_admin() )
- 	yourls_do_action( 'admin_init' );
--- 
-1.8.3.1
-
diff --git a/sources b/sources
index 9a57b24..9768b69 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-171ea94dc65d1d4f8c7e857a8b650ae1  YOURLS-1.7.tar.gz
+4f35565d362a18cdb7a6ba16acfb55ee  YOURLS-abc7d6c52f6e0ddb8d930d3022f75b46617ee0d8.tar.gz
diff --git a/yourls.spec b/yourls.spec
index 2043896..e4107c3 100644
--- a/yourls.spec
+++ b/yourls.spec
@@ -1,6 +1,10 @@
+%global commit abc7d6c52f6e0ddb8d930d3022f75b46617ee0d8
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global checkout 20150410git%{shortcommit}
+
 Name:       yourls
 Version:    1.7
-Release:    2%{?dist}
+Release:    3.%{checkout}%{?dist}
 Summary:    Your Own URL Shortener
 Group:      Applications/Internet
 # License scenario:
@@ -9,15 +13,10 @@ Group:      Applications/Internet
 #  * JQuery files: MIT or GPLv2
 License:    GPL+ and LGPLv2+ and (MIT or GPLv2)
 URL:        http://yourls.org
-# The tarball was pulled from https://github.com/YOURLS/YOURLS/archive/%{version}.tar.gz
-# however the url is redirected and the tarball name downloaded is not %{version}.tar.gz
-# but YOURLS-%{version}.tar.gz instead
-Source0:    YOURLS-%{version}.tar.gz
+Source0:    https://github.com/YOURLS/YOURLS/archive/%{commit}/YOURLS-%{commit}.tar.gz
 Source1:    yourls-httpd.conf
 Patch0:     yourls.change-config-path.patch
 Patch1:     yourls.add-fedora-readme.patch
-# upstream patch for: Incorrect error message after installation
-Patch2:     0001-Don-t-check-for-new-version-when-updating-or-install.patch
 
 Requires:   php >= 4.3.0, mysql >= 4.1.0, httpd, php-mysql
 BuildArch:  noarch
@@ -31,10 +30,9 @@ you can pick custom keyword URLs, it comes with its own API.
 
 
 %prep
-%setup -q -n YOURLS-%{version}
+%setup -q -n YOURLS-%{commit}
 %patch0
 %patch1
-%patch2 -p1
 
 
 %build
@@ -71,6 +69,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Apr 10 2015 Martin Krizek <mkrizek at redhat.com> - 1.7-3.20150410gitabc7d6c
+- Update to the latest master from git
+- Fix bz #1157335
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/yourls.git/commit/?h=f21&id=c8e314ca7e65b78c9e234b8fcbb394ea7ba09335