richardfearn pushed to ncdu (el6). "Merge remote-tracking branch 'origin/f16' into el6 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 7 16:45:33 UTC 2015


>From 48134d86965aac4597b1a14c5648f5dabda163b6 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting at fedoraproject.org>
Date: Wed, 25 Nov 2009 23:20:05 +0000
Subject: Fix typo that causes a failure to update the common directory.
 (releng     #2781)


diff --git a/Makefile b/Makefile
index 59b47c8..5e72987 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: ncdu
-# $Id$
+# $Id: Makefile,v 1.1 2008/05/02 22:23:38 kevin Exp $
 NAME := ncdu
 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))
-- 
cgit v0.10.2


>From 14beb1588e6791809155843c481e2c13d89eb672 Mon Sep 17 00:00:00 2001
From: richardfearn <richardfearn at fedoraproject.org>
Date: Sat, 28 Nov 2009 22:47:54 +0000
Subject: update to new upstream version 1.6


diff --git a/.cvsignore b/.cvsignore
index 1e10a54..f85d226 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ncdu-1.5.tar.gz
+ncdu-1.6.tar.gz
diff --git a/ncdu.spec b/ncdu.spec
index ded124a..a681102 100644
--- a/ncdu.spec
+++ b/ncdu.spec
@@ -1,12 +1,12 @@
 Name:           ncdu
-Version:        1.5
+Version:        1.6
 Release:        1%{?dist}
 Summary:        Text-based disk usage viewer
 
 Group:          Applications/File
 License:        MIT
 URL:            http://dev.yorhel.nl/ncdu/
-Source0:        http://dev.yorhel.nl/download/ncdu-1.5.tar.gz
+Source0:        http://dev.yorhel.nl/download/ncdu-1.6.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel
@@ -36,6 +36,10 @@ rm -rf %{buildroot}
 %{_bindir}/ncdu
 
 %changelog
+* Sat Nov 28 2009 Richard Fearn <richardfearn at gmail.com> - 1.6-1
+- update to new upstream version 1.6
+
+%changelog
 * Sun Jul 26 2009 Richard Fearn <richardfearn at gmail.com> - 1.5-1
 - update to new upstream version 1.5
 
diff --git a/sources b/sources
index c116728..ee871f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90a69cc3b2e9f0324eb14e6ce1df0f22  ncdu-1.5.tar.gz
+95d29cf64af2d8cf4b5005e6e3d60384  ncdu-1.6.tar.gz
-- 
cgit v0.10.2


>From 271d3e3b157372489ec069916c56a740b9e090c5 Mon Sep 17 00:00:00 2001
From: richardfearn <richardfearn at fedoraproject.org>
Date: Tue, 5 Jan 2010 10:15:58 +0000
Subject: remove duplicate %changelog from spec files


diff --git a/ncdu.spec b/ncdu.spec
index a681102..b7960b1 100644
--- a/ncdu.spec
+++ b/ncdu.spec
@@ -39,7 +39,6 @@ rm -rf %{buildroot}
 * Sat Nov 28 2009 Richard Fearn <richardfearn at gmail.com> - 1.6-1
 - update to new upstream version 1.6
 
-%changelog
 * Sun Jul 26 2009 Richard Fearn <richardfearn at gmail.com> - 1.5-1
 - update to new upstream version 1.5
 
-- 
cgit v0.10.2


>From fc1f9b02c2c2d531304698dfd8e16ba758968f6a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 04:06:04 +0000
Subject: dist-git conversion


diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index f85d226..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-ncdu-1.6.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f85d226
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+ncdu-1.6.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 5e72987..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: ncdu
-# $Id: Makefile,v 1.1 2008/05/02 22:23:38 kevin Exp $
-NAME := ncdu
-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)
-- 
cgit v0.10.2


>From 49d6e75779dc10df2b316be96f08fec95415cfdd Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Tue, 8 Feb 2011 17:22:51 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild


diff --git a/ncdu.spec b/ncdu.spec
index b7960b1..95dc354 100644
--- a/ncdu.spec
+++ b/ncdu.spec
@@ -1,6 +1,6 @@
 Name:           ncdu
 Version:        1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Text-based disk usage viewer
 
 Group:          Applications/File
@@ -36,6 +36,9 @@ rm -rf %{buildroot}
 %{_bindir}/ncdu
 
 %changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Sat Nov 28 2009 Richard Fearn <richardfearn at gmail.com> - 1.6-1
 - update to new upstream version 1.6
 
-- 
cgit v0.10.2


>From 62607957897da6a09cda822cb8520b35813f04b5 Mon Sep 17 00:00:00 2001
From: Richard Fearn <richardfearn at gmail.com>
Date: Sun, 4 Sep 2011 13:22:49 +0100
Subject: update to new upstream version 1.7


diff --git a/.gitignore b/.gitignore
index f85d226..8a81c67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ncdu-1.6.tar.gz
+/ncdu-1.7.tar.gz
diff --git a/ncdu.spec b/ncdu.spec
index 95dc354..f1bedd5 100644
--- a/ncdu.spec
+++ b/ncdu.spec
@@ -1,13 +1,12 @@
 Name:           ncdu
-Version:        1.6
-Release:        2%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        Text-based disk usage viewer
 
 Group:          Applications/File
 License:        MIT
 URL:            http://dev.yorhel.nl/ncdu/
-Source0:        http://dev.yorhel.nl/download/ncdu-1.6.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://dev.yorhel.nl/download/ncdu-1.7.tar.gz
 
 BuildRequires:  ncurses-devel
 
@@ -23,19 +22,18 @@ and provides a fast way to see what directories are using your disk space.
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %{_mandir}/man1/ncdu.1.gz
 %doc AUTHORS COPYING ChangeLog TODO
 %{_bindir}/ncdu
 
 %changelog
+* Sun Sep 04 2011 Richard Fearn <richardfearn at gmail.com> - 1.7-1
+- update to new upstream version 1.7
+- remove unnecessary bits from spec
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index ee871f3..5f93f67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95d29cf64af2d8cf4b5005e6e3d60384  ncdu-1.6.tar.gz
+172047c29d232724cc62e773e82e592a  ncdu-1.7.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ncdu.git/commit/?h=el6&id=2ad60fbf264525320f0360a2d32fd182dcef4658


More information about the scm-commits mailing list