From c3c19175a19dde7d58dcd25b26da89a5b8ae2ef8 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:42:57 +0000
Subject: [PATCH 1/4] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b923d32..bd7a56e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: sqlgrey
-# $Id$
+# $Id: Makefile,v 1.1 2006/12/19 01:57:56 steve Exp $
 NAME := sqlgrey
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 69e7d0a2c2f683aa515eb140d1e8d0d00dfbdbdc Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@fedoraproject.org>
Date: Sat, 8 May 2010 02:24:02 +0000
Subject: [PATCH 2/4] Initialize branch EL-6 for sqlgrey

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..46381b9
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+EL-6

From d6d3bb88661100550cc8762fc8895914395fd2f8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 13:06:53 +0000
Subject: [PATCH 3/4] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index bd7a56e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: sqlgrey
-# $Id: Makefile,v 1.1 2006/12/19 01:57:56 steve Exp $
-NAME := sqlgrey
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index 46381b9..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-EL-6

From 93f5dfc93a16d339be0d4d532a852536ec4966d7 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 23 Jul 2016 15:16:07 -0600
Subject: [PATCH 4/4] Fix status in service file. Fixes bug #1358021

---
 sqlgrey.init | 1 +
 sqlgrey.spec | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sqlgrey.init b/sqlgrey.init
index 1703cc0..e7602bf 100644
--- a/sqlgrey.init
+++ b/sqlgrey.init
@@ -47,6 +47,7 @@ case "$1" in
 
     status)
         status sqlgrey
+        RETVAL=$?
         ;;
 
     reload)
diff --git a/sqlgrey.spec b/sqlgrey.spec
index 53bf20d..5f0eeff 100644
--- a/sqlgrey.spec
+++ b/sqlgrey.spec
@@ -1,6 +1,6 @@
 Name:           sqlgrey
 Version:        1.7.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Postfix grey-listing policy service
 Group:          System Environment/Daemons
 License:        GPLv2+
@@ -82,6 +82,9 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %changelog
+* Sat Jul 23 2016 Kevin Fenzi <kevin@scrye.com> - 1.7.6-4
+- Fix status in service file. Fixes bug #1358021
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild