From 0aa3e8889c008499561f2de45538402b61bcd355 Mon Sep 17 00:00:00 2001
From: Petr Sabata <contyk@redhat.com>
Date: Nov 02 2011 12:30:49 +0000
Subject: 1.0 bump


---

diff --git a/.gitignore b/.gitignore
index 83e36c1..3610015 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /sxiv-0.8.1.tar.gz
 /sxiv-0.8.2.tar.gz
 /sxiv-0.9.tar.gz
+/sxiv-1.0.tar.gz
diff --git a/sources b/sources
index ce0abfd..2a62284 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-865f1e542669ad6d7932fcd4664fb481  sxiv-0.9.tar.gz
+c887e0af1e4d5a101b285a46d288c419  sxiv-1.0.tar.gz
diff --git a/sxiv-0.8.2-do-not-change-ownership.patch b/sxiv-0.8.2-do-not-change-ownership.patch
deleted file mode 100644
index da14946..0000000
--- a/sxiv-0.8.2-do-not-change-ownership.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 9b97a12..ac8274b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -19,7 +19,7 @@ sxiv:	$(OBJ)
- 	$(CC) $(CFLAGS) -c -o $@ $<
- 
- install: all
--	install -D -m 755 -o root -g root sxiv $(DESTDIR)$(PREFIX)/bin/sxiv
-+	install -D -m 755 sxiv $(DESTDIR)$(PREFIX)/bin/sxiv
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
- 	sed "s/VERSION/$(VERSION)/g" sxiv.1 > $(DESTDIR)$(PREFIX)/share/man/man1/sxiv.1
- 	chmod 644 $(DESTDIR)$(PREFIX)/share/man/man1/sxiv.1
diff --git a/sxiv-0.9-optflags.patch b/sxiv-0.9-optflags.patch
deleted file mode 100644
index 08d33bd..0000000
--- a/sxiv-0.9-optflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 2459352..b0ee31b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -5,7 +5,7 @@ VERSION = 0.9
- CC = gcc
- DESTDIR =
- PREFIX = /usr/local
--CFLAGS = -Wall -pedantic -O2 -DVERSION=\"$(VERSION)\"
-+CFLAGS+= -Wall -pedantic -O2 -DVERSION=\"$(VERSION)\"
- LDFLAGS =
- LIBS = -lX11 -lImlib2
- 
diff --git a/sxiv-1.0-optflags.patch b/sxiv-1.0-optflags.patch
new file mode 100644
index 0000000..69b1f93
--- /dev/null
+++ b/sxiv-1.0-optflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 32c644f..95b9806 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 1.0
+ 
+ CC      = gcc
+-CFLAGS  = -ansi -Wall -pedantic -O2
++CFLAGS += -ansi -Wall -pedantic -O2
+ LDFLAGS =
+ LIBS    = -lX11 -lImlib2
+ 
diff --git a/sxiv.spec b/sxiv.spec
index 900c856..c99a5d8 100644
--- a/sxiv.spec
+++ b/sxiv.spec
@@ -1,5 +1,5 @@
 Name:           sxiv
-Version:        0.9
+Version:        1.0
 Release:        1%{?dist}
 Summary:        Simple (or small or suckless) X Image Viewer
 Group:          Applications/Multimedia
@@ -7,10 +7,7 @@ License:        GPLv2+
 URL:            https://github.com/muennich/%{name}/
 Source0:        https://github.com/downloads/muennich/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
-# Do not change sxiv binary ownership to root:root
-# Allows rpm-building the package by regular users
-Patch0:         sxiv-0.8.2-do-not-change-ownership.patch
-Patch1:         sxiv-0.9-optflags.patch
+Patch0:         sxiv-1.0-optflags.patch
 BuildRequires:  libX11-devel
 BuildRequires:  imlib2-devel
 BuildRequires:  desktop-file-utils
@@ -25,8 +22,7 @@ customize it for your needs.
 
 %prep
 %setup -q
-%patch0 -p1 -b .do-not-change-ownership
-%patch1 -p1 -b .optflags
+%patch0 -p1 -b .optflags
 
 %build
 export CFLAGS="%{optflags}"
@@ -43,6 +39,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %{_datadir}/applications
 
 %changelog
+* Wed Nov 02 2011 Petr Sabata <contyk@redhat.com> - 1.0-1
+- 1.0 bump
+
 * Wed Aug 17 2011 Petr Sabata <contyk@redhat.com> - 0.9-1
 - 0.9 bump