[sxiv] 0.8.2 bump

Petr Sabata psabata at fedoraproject.org
Thu Jul 7 12:06:07 UTC 2011


commit e5cabbae83f3dd7512308791a0fccc7d96534e1d
Author: Petr Sabata <contyk at redhat.com>
Date:   Thu Jul 7 14:05:42 2011 +0200

    0.8.2 bump

 .gitignore                               |    1 +
 sources                                  |    2 +-
 sxiv-0.8.1-destdir.patch                 |   27 ---------------------------
 sxiv-0.8.1-do-not-change-ownership.patch |   13 -------------
 sxiv-0.8.2-do-not-change-ownership.patch |   13 +++++++++++++
 sxiv.spec                                |   15 +++++++--------
 6 files changed, 22 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 63f2112..f6ae76b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sxiv-0.8.1.tar.gz
+/sxiv-0.8.2.tar.gz
diff --git a/sources b/sources
index 8974406..0f8bf91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-23006a1900690d46c0ff126c76cdbd02  sxiv-0.8.1.tar.gz
+6948b4c02f9458c4160c6e458228b85f  sxiv-0.8.2.tar.gz
diff --git a/sxiv-0.8.2-do-not-change-ownership.patch b/sxiv-0.8.2-do-not-change-ownership.patch
new file mode 100644
index 0000000..da14946
--- /dev/null
+++ b/sxiv-0.8.2-do-not-change-ownership.patch
@@ -0,0 +1,13 @@
+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.spec b/sxiv.spec
index 2b2afd9..b764428 100644
--- a/sxiv.spec
+++ b/sxiv.spec
@@ -1,18 +1,15 @@
 Name:           sxiv
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        Simple (or small or suckless) X Image Viewer
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            https://github.com/muennich/%{name}/
 Source0:        https://github.com/downloads/muennich/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
-# Support DESTDIR
-# https://github.com/muennich/sxiv/pull/3
-Patch0:         sxiv-0.8.1-destdir.patch
 # Do not change sxiv binary ownership to root:root
 # Allows rpm-building the package by regular users
-Patch1:         sxiv-0.8.1-do-not-change-ownership.patch
+Patch0:         sxiv-0.8.2-do-not-change-ownership.patch
 BuildRequires:  libX11-devel
 BuildRequires:  imlib2-devel
 BuildRequires:  desktop-file-utils
@@ -27,8 +24,7 @@ customize it for your needs.
 
 %prep
 %setup -q
-%patch0 -p1 -b .destdir
-%patch1 -p1 -b .do-not-change-ownership
+%patch0 -p1 -b .do-not-change-ownership
 
 %build
 export CFLAGS="%{optflags}"
@@ -45,6 +41,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %{_datadir}/applications
 
 %changelog
+* Thu Jul 07 2011 Petr Sabata <contyk at redhat.com> - 0.8.2-1
+- 0.8.2 bump
+
 * Wed May 11 2011 Petr Sabata <psabata at redhat.com> - 0.8.1-2
 - Correcting license to GPLv2+
 - Using Github URL as Source


More information about the scm-commits mailing list