From b0643658ec781492984ca569cacd8ae90d325a22 Mon Sep 17 00:00:00 2001 From: jbowes Date: Jun 19 2007 13:35:43 +0000 Subject: tig-0.8-1 for rawhide --- diff --git a/.cvsignore b/.cvsignore index dfd68dd..4f4fb64 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -tig-0.7.tar.gz +tig-0.8.tar.gz diff --git a/Allow-CFLAGS-to-be-overridden-while-preserving-VERSI.patch b/Allow-CFLAGS-to-be-overridden-while-preserving-VERSI.patch deleted file mode 100644 index e7f5816..0000000 --- a/Allow-CFLAGS-to-be-overridden-while-preserving-VERSI.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 461c48ddedf63b588da5dbad11565391612fbfd8 Mon Sep 17 00:00:00 2001 -From: James Bowes -Date: Sat, 2 Jun 2007 12:52:48 -0400 -Subject: [PATCH] Allow CFLAGS to be overridden while preserving VERSION - -If someone defined their own CFLAGS, they would have to include a -DVERSION= -as well (or else get unknown-version as the version). - -Signed-off-by: James Bowes ---- - Makefile | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index 61fc86b..91cb097 100644 ---- a/Makefile -+++ b/Makefile -@@ -20,7 +20,7 @@ endif - RPM_VERSION = $(subst -,.,$(VERSION)) - - LDLIBS = -lcurses --CFLAGS = -Wall -O2 '-DVERSION="$(VERSION)"' -+CFLAGS = -Wall -O2 - DFLAGS = -g -DDEBUG -Werror - PROGS = tig - MANDOC = tig.1 tigrc.5 -@@ -28,6 +28,8 @@ HTMLDOC = tig.1.html tigrc.5.html manual.html README.html - ALLDOC = $(MANDOC) $(HTMLDOC) manual.html-chunked manual.pdf - TARNAME = tig-$(RPM_VERSION) - -+override CFLAGS += '-DVERSION="$(VERSION)"' -+ - all: $(PROGS) - all-debug: $(PROGS) - all-debug: CFLAGS += $(DFLAGS) --- -1.5.2.888.g96a5e - diff --git a/Supply-explicit-permission-bits-to-install.patch b/Supply-explicit-permission-bits-to-install.patch deleted file mode 100644 index 58582a3..0000000 --- a/Supply-explicit-permission-bits-to-install.patch +++ /dev/null @@ -1,56 +0,0 @@ -From a066a53681c331e096cc88ffbeaced33372c5448 Mon Sep 17 00:00:00 2001 -From: Jeffrey C. Ollie -Date: Thu, 31 May 2007 14:20:32 -0500 -Subject: [PATCH] Supply explicit permission bits to 'install' - -'install' will install files with permissions set to '0755' if the -permissions are not specified on the command line. Having the execute -bits set on non-executable content is not desireable. Specify mode -0644 for non-executable content as well as specify mode 0755 for -executable content (in case the defaults change or are different on -different systems). Also tell 'install' to preserve timestamps. - -[ Updated to also do it when installing HTML files. --jonas ] - -Signed-off-by: Jeffrey C. Ollie -Signed-off-by: Jonas Fonseca ---- - Makefile | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 57196b0..0e42de6 100644 ---- a/Makefile -+++ b/Makefile -@@ -38,7 +38,7 @@ doc-html: $(HTMLDOC) - install: all - mkdir -p $(DESTDIR)$(bindir) && \ - for prog in $(PROGS); do \ -- install $$prog $(DESTDIR)$(bindir); \ -+ install -p -m 0755 $$prog $(DESTDIR)$(bindir); \ - done - - install-doc-man: doc-man -@@ -46,8 +46,8 @@ install-doc-man: doc-man - $(DESTDIR)$(mandir)/man5 - for doc in $(MANDOC); do \ - case "$$doc" in \ -- *.1) install $$doc $(DESTDIR)$(mandir)/man1 ;; \ -- *.5) install $$doc $(DESTDIR)$(mandir)/man5 ;; \ -+ *.1) install -p -m 0644 $$doc $(DESTDIR)$(mandir)/man1 ;; \ -+ *.5) install -p -m 0644 $$doc $(DESTDIR)$(mandir)/man5 ;; \ - esac \ - done - -@@ -55,7 +55,7 @@ install-doc-html: doc-html - mkdir -p $(DESTDIR)$(docdir)/tig - for doc in $(HTMLDOC); do \ - case "$$doc" in \ -- *.html) install $$doc $(DESTDIR)$(docdir)/tig ;; \ -+ *.html) install -p -m 0644 $$doc $(DESTDIR)$(docdir)/tig ;; \ - esac \ - done - --- -1.5.2.888.g96a5e - diff --git a/sources b/sources index ad74b86..a16425b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3774b673e1180461fb003378908604e9 tig-0.7.tar.gz +4f74cd15f0c132e060088fbd9fe92a4b tig-0.8.tar.gz diff --git a/tig.spec b/tig.spec index 656b640..5b56123 100644 --- a/tig.spec +++ b/tig.spec @@ -1,14 +1,12 @@ Name: tig -Version: 0.7 -Release: 4%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: Text-mode interface for the git revision control system Group: Development/Tools License: GPL URL: http://jonas.nitro.dk/tig Source0: http://jonas.nitro.dk/tig/releases/%{name}-%{version}.tar.gz -Patch0: Supply-explicit-permission-bits-to-install.patch -Patch1: Allow-CFLAGS-to-be-overridden-while-preserving-VERSI.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -29,8 +27,6 @@ Using it as a pager, it will display input from stdin and colorize it. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build @@ -61,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 19 2007 James Bowes - 0.8-1 +- tig-0.8 + * Sat Jun 02 2007 James Bowes - 0.7-4 - Ensure that the version string is set in the binary.