From 30a7a6fb20e49037e9e915b157ef1be6b9582aa07080fa803c75a10848068002 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 9 Jan 2018 17:04:34 +0000
Subject: [PATCH] - Update download url

OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=142
---
 squid.changes |  5 +++++
 squid.spec    | 23 +++++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/squid.changes b/squid.changes
index e3c45f1..d274957 100644
--- a/squid.changes
+++ b/squid.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan  9 17:06:14 UTC 2018 - mpluskal@suse.com
+
+- Update download url
+
 -------------------------------------------------------------------
 Mon Jan  8 12:21:51 UTC 2018 - adam.majer@suse.de
 
diff --git a/squid.spec b/squid.spec
index a665d5a..3cb772b 100644
--- a/squid.spec
+++ b/squid.spec
@@ -16,22 +16,21 @@
 #
 
 
-#Compat macro for new _fillupdir macro introduced in Nov 2017
-%if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
-%endif
-
 %define         squidlibdir %{_libdir}/squid
 %define         squidconfdir %{_sysconfdir}/squid
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir %{_localstatedir}/adm/fillup-templates
+%endif
 Name:           squid
 Version:        4.0.22
 Release:        0
 Summary:        Caching and forwarding HTTP web proxy
 License:        GPL-2.0+
 Group:          Productivity/Networking/Web/Proxy
-Url:            http://www.squid-cache.org
-Source0:        http://www.squid-cache.org/Versions/v4/4.0/%{name}-%{version}.tar.xz
-Source1:        http://www.squid-cache.org/Versions/v4/4.0/%{name}-%{version}.tar.xz.asc
+URL:            http://www.squid-cache.org
+Source0:        http://www.squid-cache.org/Versions/v4/squid-%{version}.tar.xz
+Source0:        http://www.squid-cache.org/Versions/v4/squid-%{version}.tar.xz.asc
 Source4:        squid.sysconfig
 Source5:        pam.squid
 Source6:        unsquid.pl
@@ -52,9 +51,6 @@ BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libcap-devel
 BuildRequires:  libtool
-%if 0%{?suse_version} >= 1330
-BuildRequires:  libnsl-devel
-%endif
 BuildRequires:  openldap2-devel
 BuildRequires:  opensp-devel
 BuildRequires:  openssl-devel
@@ -79,6 +75,9 @@ Provides:       http_proxy
 Provides:       %{name}3 = %{version}
 Obsoletes:      %{name}3 < %{version}
 %{?systemd_requires}
+%if 0%{?suse_version} >= 1330
+BuildRequires:  libnsl-devel
+%endif
 
 %description
 Squid is a caching proxy for the Web supporting HTTP(S), FTP, and
@@ -145,7 +144,7 @@ make SAMBAPREFIX=%{_prefix} %{?_smp_mflags}
 
 %install
 install -d -m 750 %{buildroot}%{_localstatedir}/{cache,log}/%{name}
-install -d %{buildroot}%{_prefix}/sbin
+install -d %{buildroot}%{_sbindir}
 
 # make_install
 %make_install SAMBAPREFIX=%{_prefix}