rpms/gxemul/EL-6 gxemul-0.6.0-Makefile-cleanup.patch, NONE, 1.1 gxemul.spec, 1.19, 1.20 sources, 1.12, 1.13

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/gxemul/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27191

Modified Files:
	gxemul.spec sources 
Added Files:
	gxemul-0.6.0-Makefile-cleanup.patch 
Log Message:
sync

gxemul-0.6.0-Makefile-cleanup.patch:
 Makefile.skel |   15 ++++++++-------
 configure     |   12 ++++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

--- NEW FILE gxemul-0.6.0-Makefile-cleanup.patch ---
diff -up gxemul-0.6.0/configure.BAD gxemul-0.6.0/configure
--- gxemul-0.6.0/configure.BAD	2010-02-15 17:39:08.890669091 -0500
+++ gxemul-0.6.0/configure	2010-02-15 17:42:53.566765806 -0500
@@ -1013,6 +1013,17 @@ echo "checking for 'make install' prefix
 
 ###############################################################################
 
+# On some platforms, the man pages are in /usr/man, but on Linux, /usr/share/man is the 
+# correct location. This can be overridden by passing MANDIR=/foo/bar at configure.
+
+DEFAULTMANDIR=/usr/share/man
+
+if [ "z$MANDIR" = z ]; then
+	MANDIR="$DEFAULTMANDIR"
+fi
+
+###############################################################################
+
 INCLUDE=-Iinclude/
 DINCLUDE=-I../include/
 INCLUDE2=-I../../include/
@@ -1033,6 +1044,7 @@ echo "CPU_TOOLS=$CPU_TOOLS" >> _Makefile
 echo "DOXYGEN=$DOXYGEN" >> _Makefile.header
 echo "VALGRIND=$VALGRIND" >> _Makefile.header
 echo "PREFIX=$PREFIX" >> _Makefile.header
+echo "MANDIR=$MANDIR" >> _Makefile.header
 echo "" >> _Makefile.header
 
 #  Create list of unit testable classes:
diff -up gxemul-0.6.0/Makefile.skel.BAD gxemul-0.6.0/Makefile.skel
--- gxemul-0.6.0/Makefile.skel.BAD	2010-02-15 17:43:10.980800498 -0500
+++ gxemul-0.6.0/Makefile.skel	2010-02-15 17:43:34.918650887 -0500
@@ -4,6 +4,7 @@
 
 BIN=gxemul
 LIBS=$(XLIB) $(OTHERLIBS)
+DESTDIR=
 
 all: build
 
@@ -31,17 +32,17 @@ documentation: build
 
 install: documentation test
 	@echo Installing binaries, man page, and documentation...
-	mkdir -p $(PREFIX)/bin
-	cp -f $(BIN) $(PREFIX)/bin/
-	mkdir -p $(PREFIX)/man/man1
-	cp -f man/gxemul.1 $(PREFIX)/man/man1/
-	mkdir -p $(PREFIX)/share/doc/gxemul
-	cp -R doc/* $(PREFIX)/share/doc/gxemul/
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	cp -f $(BIN) $(DESTDIR)$(PREFIX)/bin/
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
+	cp -f man/gxemul.1 $(DESTDIR)$(MANDIR)/man1/
+	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/gxemul
+	cp -R doc/* $(DESTDIR)$(PREFIX)/share/doc/gxemul/
 
 uninstall:
 	@echo Removing binaries, man pages, and documentation...
 	rm -f $(PREFIX)/bin/gxemul
-	rm -f $(PREFIX)/man/man1/gxemul.1
+	rm -f $(MANDIR)/man1/gxemul.1
 	rm -rf $(PREFIX)/share/doc/gxemul
 
 clean:


Index: gxemul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxemul/EL-6/gxemul.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gxemul.spec	19 Aug 2009 22:24:36 -0000	1.19
+++ gxemul.spec	9 Jul 2010 19:04:28 -0000	1.20
@@ -1,12 +1,12 @@
 Name:		gxemul
-Version:	0.4.7.2
-Release:	3%{?dist}
+Version:	0.6.0
+Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
 Summary:	Instruction-level machine emulator
 URL:		http://gxemul.sourceforge.net/
 Source0:	http://gxemul.sourceforge.net/src/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:		gxemul-0.6.0-Makefile-cleanup.patch
 BuildRequires:	libX11-devel, xorg-x11-proto-devel
 
 %description
@@ -19,28 +19,34 @@ on a real machine.
 
 %prep
 %setup -q
+%patch0 -p1 -b .cleanup
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure
+CXXFLAGS="$RPM_OPT_FLAGS" PREFIX="%{_prefix}" ./configure
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -m755 gxemul $RPM_BUILD_ROOT%{_bindir}
-install -m644 man/gxemul.1 $RPM_BUILD_ROOT%{_mandir}/man1
+make DESTDIR=%{buildroot} install
+
+# mkdir -p $RPM_BUILD_ROOT%{_bindir}
+# mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+# install -m755 gxemul $RPM_BUILD_ROOT%{_bindir}
+# install -m644 man/gxemul.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,0755)
-%doc LICENSE HISTORY RELEASE.html README doc/* demos/
+%doc LICENSE HISTORY README demos/
+%doc %{_datadir}/doc/gxemul/
 %{_bindir}/gxemul
 %{_mandir}/man1/gxemul.*
 
 %changelog
+* Mon Feb 15 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.0-1
+- update to 0.6.0
+
 * Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.7.2-3
 - fix urls
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gxemul/EL-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Jul 2009 01:21:33 -0000	1.12
+++ sources	9 Jul 2010 19:04:28 -0000	1.13
@@ -1 +1 @@
-a2ec4f58a831dd883c196c4fd362b702  gxemul-0.4.7.2.tar.gz
+bfdc4109ddd05361be0db0084dd3dbed  gxemul-0.6.0.tar.gz