SPECS: herrie.spec - 1.4 - herrie-makefile.patch no longer needed ...

[lisu]

Author: lisu                         Date: Sun Feb 11 17:59:49 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 1.4
- herrie-makefile.patch no longer needed
- BR: sed >= 4.0
- configure file is included in this version so we must run it first to create a Makefile

---- Files affected:
SPECS:
   herrie.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/herrie.spec
diff -u SPECS/herrie.spec:1.15 SPECS/herrie.spec:1.16
--- SPECS/herrie.spec:1.15	Mon Jan 22 23:46:02 2007
+++ SPECS/herrie.spec	Sun Feb 11 18:59:44 2007
@@ -2,14 +2,13 @@
 Summary:	A command line music player
 Summary(pl):	Konsolowy odtwarzacz muzyki
 Name:		herrie
-Version:	1.3
+Version:	1.4
 Release:	1
 License:	BSD
 Group:		Applications/Sound
 Source0:	http://www.stack.nl/~ed/projects/herrie/distfiles/%{name}-%{version}.tar.gz
-# Source0-md5:	39402125831e5ffbad29d90790048bad
-Patch0:		%{name}-makefile.patch
-Patch1:		%{name}-curses.patch
+# Source0-md5:	1ef247bfb75fdac7844773e4a3f72650
+Patch0:		%{name}-curses.patch
 URL:		http://g-rave.nl/projects/herrie/
 BuildRequires:	curl-devel
 BuildRequires:	gettext-devel
@@ -22,6 +21,7 @@
 BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,13 +37,12 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%{__sed} -i 's at DESTROOT@DESTDIR@' configure
+%{__sed} -i 's at CC=gcc at CC=%{__cc}@' configure
 
 %build
-%{__make} \
-	CC="%{__cc}" \
-	OPTFLAGS="%{rpmcflags}" \
-	OPTLDFLAGS="%{rpmldflags}"
+./configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -69,6 +68,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2007/02/11 17:59:44  lisu
+- 1.4
+- herrie-makefile.patch no longer needed
+- BR: sed >= 4.0
+- configure file is included in this version so we must run it first to create a Makefile
+
 Revision 1.15  2007/01/22 22:46:02  lisu
 - 1.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/herrie.spec?r1=1.15&r2=1.16&f=u