dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: shed
-# $Id$
-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
-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)

import.log

@@ -1,3 +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-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.

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 \

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 <maxamillion [AT] gmail.com> - 1.15-3
+- Patched the configure cflags
+
+* Mon Apr 20 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-2
+- Fixed debuginfo issue, patched Makefile.in to not strip
+
 * Mon Apr 13 2009 Adam Miller <maxamillion [AT] gmail.com> - 1.15-1
 - New upstream release.
 
@@ -48,10 +59,13 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu Nov 27 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.14-1
 - New upstream release.
+
 * Sun Nov 02 2008 Adam Miller <maxamillion [AT] gmail.com> - 1.13-3
 - Fixed the license listing for the project.
+
 * Wed Oct 29 2008 Adam Miller <maxamillion [AT] gmail.com> - 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 <maxamillion [AT] gmail.com> - 1.13-1
 - First build of shed for fedora