From ef8f945cbf7b1dcab4255d7c5473d5b9a81811aa Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 08:10:12 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for shed --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 9cf163daa6daa6d10f42ac607e991b8c50f207ee Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 21 Apr 2009 17:16:26 +0000 Subject: [PATCH 2/4] Fix for debuginfo issue --- import.log | 1 + shed-1.15-configure_cflags.patch | 11 +++++++++++ shed-1.15-makefile_in.patch | 32 ++++++++++++++++++++++++++++++++ shed.spec | 16 +++++++++++++++- 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 shed-1.15-configure_cflags.patch create mode 100644 shed-1.15-makefile_in.patch diff --git a/import.log b/import.log index e1f7a87..ee1723c 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ shed-1_13-2:HEAD:shed-1.13-2.src.rpm:1225481433 shed-1_14-1:HEAD:shed-1.14-1.src.rpm:1227821254 shed-1_15-1:HEAD:shed-1.15-1.src.rpm:1239650206 +shed-1_15-3:F-11:shed-1.15-3.src.rpm:1240334125 diff --git a/shed-1.15-configure_cflags.patch b/shed-1.15-configure_cflags.patch new file mode 100644 index 0000000..7a1e7c9 --- /dev/null +++ b/shed-1.15-configure_cflags.patch @@ -0,0 +1,11 @@ +--- configure 2009-03-24 08:42:37.000000000 -0500 ++++ configure.patched 2009-04-21 11:13:11.000000000 -0500 +@@ -3367,7 +3367,7 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-CFLAGS="-Wall" ++CFLAGS="$CFLAGS -Wall" + + + # Check whether --enable-debug was given. diff --git a/shed-1.15-makefile_in.patch b/shed-1.15-makefile_in.patch new file mode 100644 index 0000000..84ad676 --- /dev/null +++ b/shed-1.15-makefile_in.patch @@ -0,0 +1,32 @@ +--- Makefile.in 2009-04-20 13:24:18.000000000 -0500 ++++ Makefile.in.patched 2009-04-20 13:20:53.000000000 -0500 +@@ -34,7 +34,7 @@ + subdir = . + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ +- ChangeLog INSTALL NEWS TODO depcomp install-sh missing ++ ChangeLog INSTALL NEWS TODO depcomp missing + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +@@ -489,11 +489,6 @@ + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + + installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: + + clean-generic: +@@ -566,7 +561,7 @@ + + uninstall-man: uninstall-man1 + +-.MAKE: install-am install-strip ++.MAKE: install-am + + .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ + clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \ diff --git a/shed.spec b/shed.spec index 494ad17..0bc710a 100644 --- a/shed.spec +++ b/shed.spec @@ -1,12 +1,15 @@ Name: shed Version: 1.15 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Easy to use hex editor Group: Applications/Editors License: GPLv2+ URL: http://shed.sourceforge.net/ Source0: http://master.dl.sourceforge.net/shed/%{name}-%{version}.tar.gz +Patch0: shed-1.15-makefile_in.patch +Patch1: shed-1.15-configure_cflags.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ncurses-devel @@ -18,6 +21,8 @@ with a friendly pico-style interface. %prep %setup -q +%patch0 -p0 +%patch1 -p0 %build %configure @@ -40,6 +45,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 21 2009 Adam Miller - 1.15-3 +- Patched the configure cflags + +* Mon Apr 20 2009 Adam Miller - 1.15-2 +- Fixed debuginfo issue, patched Makefile.in to not strip + * Mon Apr 13 2009 Adam Miller - 1.15-1 - New upstream release. @@ -48,10 +59,13 @@ rm -rf $RPM_BUILD_ROOT * Thu Nov 27 2008 Adam Miller - 1.14-1 - New upstream release. + * Sun Nov 02 2008 Adam Miller - 1.13-3 - Fixed the license listing for the project. + * Wed Oct 29 2008 Adam Miller - 1.13-2 - Fixed issues that were brought to my attention from package review - Typo in download, removed chmod, added changelog, incremented release + * Fri Oct 24 2008 Adam Miller - 1.13-1 - First build of shed for fedora From 3de8bede3e9de60b029ddd46779a114d3bfc1c98 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:24 +0000 Subject: [PATCH 3/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 99ca2a0..2d6f27d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: shed -# $Id$ +# $Id: Makefile,v 1.1 2008/10/31 17:01:25 kevin Exp $ NAME := shed 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 f9e4eb6c252d9526c208f1617c93f5c623642532 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:44:09 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 4 ---- 4 files changed, 26 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 2d6f27d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: shed -# $Id: Makefile,v 1.1 2008/10/31 17:01:25 kevin Exp $ -NAME := shed -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index ee1723c..0000000 --- a/import.log +++ /dev/null @@ -1,4 +0,0 @@ -shed-1_13-2:HEAD:shed-1.13-2.src.rpm:1225481433 -shed-1_14-1:HEAD:shed-1.14-1.src.rpm:1227821254 -shed-1_15-1:HEAD:shed-1.15-1.src.rpm:1239650206 -shed-1_15-3:F-11:shed-1.15-3.src.rpm:1240334125