diff options
| author | Jakub Bogusz | 2001-03-15 18:27:44 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 05cc03c7c62fd01316aa2507499a7e5f54715eb2 (patch) | |
| tree | b7c07a9ebd63678b47de33946e4df6258d2cb12b | |
| parent | e2419de51797f18a19bfef13de0d91c3ad9eeddb (diff) | |
| download | cdrdao-05cc03c7c62fd01316aa2507499a7e5f54715eb2.zip cdrdao-05cc03c7c62fd01316aa2507499a7e5f54715eb2.tar.gz | |
- opt patch (use $RPM_OPT_FLAGS, not -O20 to compile paranoia)
Changed files:
cdrdao-opt.patch -> 1.1
cdrdao.spec -> 1.5
| -rw-r--r-- | cdrdao-opt.patch | 16 | ||||
| -rw-r--r-- | cdrdao.spec | 10 |
2 files changed, 22 insertions, 4 deletions
diff --git a/cdrdao-opt.patch b/cdrdao-opt.patch new file mode 100644 index 0000000..b70e724 --- /dev/null +++ b/cdrdao-opt.patch @@ -0,0 +1,16 @@ +diff -Nur cdrdao-1.1.3.orig/paranoia/configure.in cdrdao-1.1.3/paranoia/configure.in +--- cdrdao-1.1.3.orig/paranoia/configure.in Tue Oct 26 18:13:45 1999 ++++ cdrdao-1.1.3/paranoia/configure.in Thu Mar 15 01:42:51 2001 +@@ -16,10 +16,10 @@ + case $host in + i?86-*-linux*) + DEBUG="-g -Wall -fsigned-char" +- OPT="-O20 -ffast-math -fsigned-char -finline-functions";; ++ OPT="$CFLAGS -ffast-math -fsigned-char -finline-functions";; + *) + DEBUG="-g -Wall -fsigned-char" +- OPT="-O20 -fsigned-char";; ++ OPT="$CFLAGS -fsigned-char";; + esac + fi + diff --git a/cdrdao.spec b/cdrdao.spec index 200f0a8..5bb108d 100644 --- a/cdrdao.spec +++ b/cdrdao.spec @@ -12,14 +12,14 @@ Group: Utilities/System Group(pl): Narzędzia/System License: GPL Source0: http://www.ping.de/sites/daneb/%{name}-%{version}.src.tar.gz -Patch0: cdrdao-destdir.patch -BuildRequires: gcc-c++ +Patch0: %{name}-destdir.patch +Patch1: %{name}-opt.patch BuildRequires: libstdc++-devel +BuildRequires: libsigc++-devel BuildRequires: pccts-devel # Required by frontend. #BuildRequires: gtk+-devel #BuildRequires: gtkmm-devel -BuildRequires: libsigc++-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -33,10 +33,12 @@ trybie masz znacznie większą kontrolę nad zawartością płytki. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build #autoheader;autoconf;automake; -CFLAGS="-I%{_prefix}/X11R6/includes"; export CFLAGS +(cd paranoia ; autoconf) +#CFLAGS="-I%{_prefix}/X11R6/includes" %configure \ --with-pcctsbin=%{_bindir} \ --with-pcctsinc=%{_includedir}/pccts \ |