rpms/deutex/devel deutex-4.4.0-64bit.patch, NONE, 1.1 deutex-4.4.0-build.patch, NONE, 1.1 deutex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/deutex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23952/devel

Modified Files:
	.cvsignore sources 
Added Files:
	deutex-4.4.0-64bit.patch deutex-4.4.0-build.patch deutex.spec 
Log Message:
auto-import deutex-4.4.0-1 on branch devel from deutex-4.4.0-1.src.rpm

deutex-4.4.0-64bit.patch:

--- NEW FILE deutex-4.4.0-64bit.patch ---
diff -Naur deutex-4.4.0/src/deutex.h deutex-4.4.0.new/src/deutex.h
--- deutex-4.4.0/src/deutex.h	1999-12-30 15:20:22.000000000 -0800
+++ deutex-4.4.0.new/src/deutex.h	2006-03-18 15:50:51.000000000 -0800
@@ -43,10 +43,10 @@
 /*long = Int32 on a 32 bit processor*/
 typedef char           Int8;
 typedef short          Int16;
-typedef long           Int32;
+typedef int            Int32;
 typedef unsigned char  UInt8;
 typedef unsigned short UInt16;
-typedef unsigned long  UInt32;
+typedef unsigned int   UInt32;
 #endif
 
 #if defined DeuTex

deutex-4.4.0-build.patch:

--- NEW FILE deutex-4.4.0-build.patch ---
diff -Naur deutex-4.4.0/Makefile deutex-4.4.0.new/Makefile
--- deutex-4.4.0/Makefile	2006-03-18 15:53:16.000000000 -0800
+++ deutex-4.4.0.new/Makefile	2006-03-18 16:31:25.000000000 -0800
@@ -14,10 +14,10 @@
 #   Others  Don't know. Send feedback to the maintainer.
 #
 
-PREFIX=/usr/local
+PREFIX=/usr
 
 # Compiled by users
-CFLAGS   = -O2
+CFLAGS   := -O2
 CC       = cc
 LDFLAGS  =
 
@@ -190,10 +190,10 @@
 	touch $@
 
 install:
-	install -p -m 0755 deutex   $(PREFIX)/bin
-	install -p -m 0755 deusf    $(PREFIX)/bin
-	install -p -m 0644 deutex.6 $(PREFIX)/man/man6
-	ln -sf deutex.6             $(PREFIX)/man/man6/deusf.6
+	install -pD -m 0755 deutex   $(DESTDIR)$(PREFIX)/bin/deutex
+	install -pD -m 0755 deusf    $(DESTDIR)$(PREFIX)/bin/deusf
+	install -pD -m 0644 deutex.6 $(DESTDIR)$(PREFIX)/share/man/man6/deutex.6
+	install -pD -m 0644 deutex.6 $(DESTDIR)$(PREFIX)/share/man/man6/deusf.6
 
 src/version.c: VERSION
 	printf "const char deutex_version[] = \"%s\";\n" $(VERSION) >$@


--- NEW FILE deutex.spec ---
Name:           deutex
Version:        4.4.0
Release:        1%{?dist}
Summary:        DOOM wad file manipulator

Group:          Amusements/Graphics
License:        GPL-Compatible
URL:            http://www.teaser.fr/~amajorel/deutex/
Source0:        http://www.teaser.fr/~amajorel/deutex/deutex-4.4.0.tar.gz
Patch0:         deutex-4.4.0-build.patch
Patch1:         deutex-4.4.0-64bit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
DeuTex is a wad composer for Doom, Heretic, Hexen and Strife. It can be
used to extract the lumps of a wad and save them as individual files.
Conversely, it can also build a wad from separate files. When extracting
a lump to a file, it does not just copy the raw data, it converts it to
an appropriate format (such as PPM for graphics, Sun audio for samples,
etc.). Conversely, when it reads files for inclusion in pwads, it does
the necessary conversions (for example, from PPM to Doom picture
format). In addition, DeuTex has functions such as merging wads, etc. If
you're doing any wad hacking beyond level editing, DeuTex is a must.


%prep
%setup -q
%patch0 -p1
%patch1 -p1
# Minor permissions cleanup for rpmlint.
chmod a-x src/picture.c


%build
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
iconv --from=ISO-8859-1 --to=UTF-8 deutex.6 > deutex.6.new
mv deutex.6.new deutex.6



%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/deutex
%{_bindir}/deusf
%{_mandir}/man6/*
%doc COPYING COPYING.LIB LICENSE CHANGES README
%doc docsrc/changes.html docsrc/hackers_guide.html


%changelog
* Sun Mar 19 2006 Wart <wart at kobold.org> 4.4.0-1
- Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deutex/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Mar 2006 21:56:24 -0000	1.1
+++ .cvsignore	19 Mar 2006 21:56:56 -0000	1.2
@@ -0,0 +1 @@
+deutex-4.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deutex/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Mar 2006 21:56:24 -0000	1.1
+++ sources	19 Mar 2006 21:56:56 -0000	1.2
@@ -0,0 +1 @@
+4c4ea0ff9eae76165a3756b756d71a16  deutex-4.4.0.tar.gz