rpms/simulavr/devel 0001-Allow-overriding-ENABLE_WARNINGS.patch, NONE, 1.1 import.log, NONE, 1.1 simulavr.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans Ulrich Niedermann
ndim at fedoraproject.org
Mon Feb 1 23:28:37 UTC 2010
Author: ndim
Update of /cvs/pkgs/rpms/simulavr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11336/devel
Modified Files:
.cvsignore sources
Added Files:
0001-Allow-overriding-ENABLE_WARNINGS.patch import.log
simulavr.spec
Log Message:
Initial import (#551560).
0001-Allow-overriding-ENABLE_WARNINGS.patch:
Makefile.am | 2 +-
Makefile.in | 2 +-
disp-vcd/Makefile.am | 2 +-
disp-vcd/Makefile.in | 2 +-
disp/Makefile.am | 2 +-
disp/Makefile.in | 3 +--
6 files changed, 6 insertions(+), 7 deletions(-)
--- NEW FILE 0001-Allow-overriding-ENABLE_WARNINGS.patch ---
>From d79a71676675636b89c78ddcc41b6faea52d410d Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date: Wed, 30 Dec 2009 19:31:51 +0100
Subject: [PATCH] Allow overriding ENABLE_WARNINGS
Change occurences of @ENABLE_WARNINGS@ to $(ENABLE_WARNINGS) in
Makefile.am and Makefile.in. Then we can just override ENABLE_WARNINGS
on the make command line if necessary.
We require this to work around the flex generated code ignoring the
fwrite(3) return value, which generates a warning.
---
src/Makefile.am | 2 +-
src/Makefile.in | 2 +-
src/disp-vcd/Makefile.am | 2 +-
src/disp-vcd/Makefile.in | 2 +-
src/disp/Makefile.am | 2 +-
src/disp/Makefile.in | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 8cba01d..cbb59f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = getopt @ac_curses_disp_dirs@ disp-vcd
DIST_SUBDIRS = getopt disp disp-vcd
-AM_CFLAGS = @ENABLE_WARNINGS@ \
+AM_CFLAGS = $(ENABLE_WARNINGS) \
-I$(top_srcdir)/src/getopt
bin_PROGRAMS = simulavr
diff --git a/src/Makefile.in b/src/Makefile.in
index 921b5ce..61fb64d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -225,7 +225,7 @@ target_vendor = @target_vendor@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = getopt @ac_curses_disp_dirs@ disp-vcd
DIST_SUBDIRS = getopt disp disp-vcd
-AM_CFLAGS = @ENABLE_WARNINGS@ \
+AM_CFLAGS = $(ENABLE_WARNINGS) \
-I$(top_srcdir)/src/getopt
simulavr_LDADD = getopt/libgnugetopt.a
diff --git a/src/disp-vcd/Makefile.am b/src/disp-vcd/Makefile.am
index cfcae4f..bcf0ebc 100644
--- a/src/disp-vcd/Makefile.am
+++ b/src/disp-vcd/Makefile.am
@@ -29,7 +29,7 @@ simulavr_vcd_SOURCES = disp.c \
config_parser.y \
config_scanner.l
-AM_CFLAGS = @ENABLE_WARNINGS@ \
+AM_CFLAGS = $(ENABLE_WARNINGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/getopt
diff --git a/src/disp-vcd/Makefile.in b/src/disp-vcd/Makefile.in
index bb22595..46fc128 100644
--- a/src/disp-vcd/Makefile.in
+++ b/src/disp-vcd/Makefile.in
@@ -219,7 +219,7 @@ simulavr_vcd_SOURCES = disp.c \
config_parser.y \
config_scanner.l
-AM_CFLAGS = @ENABLE_WARNINGS@ \
+AM_CFLAGS = $(ENABLE_WARNINGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/getopt
diff --git a/src/disp/Makefile.am b/src/disp/Makefile.am
index 23238bd..99c6d95 100644
--- a/src/disp/Makefile.am
+++ b/src/disp/Makefile.am
@@ -25,6 +25,6 @@ bin_PROGRAMS = simulavr-disp
simulavr_disp_SOURCES = disp.c
simulavr_disp_LDADD = @ac_lib_curses@ ../getopt/libgnugetopt.a
-AM_CFLAGS = @ENABLE_WARNINGS@ \
+AM_CFLAGS = $(ENABLE_WARNINGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/getopt
diff --git a/src/disp/Makefile.in b/src/disp/Makefile.in
index 4a266fd..f6b14f7 100644
--- a/src/disp/Makefile.in
+++ b/src/disp/Makefile.in
@@ -210,7 +210,7 @@ target_vendor = @target_vendor@
MAINTAINERCLEANFILES = Makefile.in
simulavr_disp_SOURCES = disp.c
simulavr_disp_LDADD = @ac_lib_curses@ ../getopt/libgnugetopt.a
-AM_CFLAGS = @ENABLE_WARNINGS@ \
+AM_CFLAGS = $(ENABLE_WARNINGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/getopt
--
1.6.2.5
--- NEW FILE import.log ---
simulavr-0_1_2_6-5_fc11:HEAD:simulavr-0.1.2.6-5.fc11.src.rpm:1265066874
--- NEW FILE simulavr.spec ---
# Only build noarch subpackages if distribution supports it
%if 0%{?fedora} >= 11
%global noarch_subpackage BuildArch: noarch
%else
%global noarch_subpackage %{nil}
%endif
Name: simulavr
Version: 0.1.2.6
Release: 5%{?dist}
Summary: An AVR Simulator
Group: Development/Tools
License: GPLv2+
URL: http://savannah.nongnu.org/projects/simulavr/
Source0: http://download.savannah.nongnu.org/releases/simulavr/%{name}-%{version}.tar.gz
# Allow overriding ENABLE_WARNINGS definition
Patch100: 0001-Allow-overriding-ENABLE_WARNINGS.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: avr-binutils
BuildRequires: avr-gcc
BuildRequires: avr-libc
BuildRequires: bison
BuildRequires: doxygen
BuildRequires: flex
BuildRequires: ncurses-devel
BuildRequires: python
BuildRequires: texi2html
BuildRequires: texinfo
BuildRequires: texinfo-tex
%description
A simulator for microcontrollers from Atmel's AVR series.
%package doc
Group: Development/Tools
Summary: Documentation for simulavr (HTML and PDF)
%{noarch_subpackage}
%description doc
A simulator for microcontrollers from Atmel's AVR series.
This subpackage contains the documentation in HTML and PDF format.
%prep
%setup -q
%patch100 -p1 -b .override-enable-warnings
%build
%configure --enable-pdf
# FIXME: Skip -Werror for now, as flex generated code ignores
# fwrite(3) return value which generates a warning.
make %{?_smp_mflags} ENABLE_WARNINGS="-Wall -Winline"
%install
rm -rf "%{buildroot}"
make install DESTDIR="%{buildroot}"
rm -f "%{buildroot}%{_infodir}/dir"
# Caution: We will not notice when anything new appears in docdir.
# So package maintainers need to be careful on updates.
mv "%{buildroot}%{_docdir}/%{name}-%{version}" docdir
%clean
rm -rf "%{buildroot}"
%check
make DESTDIR="%{buildroot}" check
%post
/sbin/install-info "%{_infodir}/simulavr.info.gz" "%{_infodir}/dir" || :
%preun
if [ "$1" = 0 ]; then
/sbin/install-info --delete "%{_infodir}/simulavr.info.gz" "%{_infodir}/dir" || :
fi
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%doc ChangeLog ChangeLog-2001 ChangeLog-2002 ChangeLog-2003
%doc ProjSummary README README.gdb README.opcodes TODO
%{_bindir}/simulavr
%{_bindir}/simulavr-disp
%{_bindir}/simulavr-vcd
%{_infodir}/simulavr.info.gz
%{_mandir}/man1/simulavr-disp.1.gz
%{_mandir}/man1/simulavr.1.gz
%files doc
%defattr(-,root,root,-)
%doc docdir/html
%doc docdir/internals_html
%doc docdir/simulavr-internals.pdf
%doc docdir/simulavr.pdf
%changelog
* Thu Dec 31 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.1.2.6-5
- Spec file: description, comment improvements
* Wed Dec 30 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.1.2.6-4
- Capitalize -doc subpackage summary
- Use generic download URL instead of specific mirror
- Use mktemp based BuildRoot
- Spec file comment cleanup
* Wed Dec 30 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.1.2.6-3
- Add the final BuildRequires (texinfo-tex, texi2html)
* Wed Dec 30 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.1.2.6-2
- Add sufficient BuildRequires for mock build
* Wed Dec 30 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.1.2.6-1
- Initial RPM package for Fedora
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/simulavr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 1 Feb 2010 22:58:37 -0000 1.1
+++ .cvsignore 1 Feb 2010 23:28:37 -0000 1.2
@@ -0,0 +1 @@
+simulavr-0.1.2.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/simulavr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 1 Feb 2010 22:58:38 -0000 1.1
+++ sources 1 Feb 2010 23:28:37 -0000 1.2
@@ -0,0 +1 @@
+e6b6a862bfb7e8eccc86a1c146f87d32 simulavr-0.1.2.6.tar.gz
More information about the scm-commits
mailing list