rpms/xmbdfed/devel import.log, NONE, 1.1 xmbdfed-4.7-linux.patch, NONE, 1.1 xmbdfed-4.7-patch1, NONE, 1.1 xmbdfed-4.7-staticfix.patch, NONE, 1.1 xmbdfed.desktop, NONE, 1.1 xmbdfed.png, NONE, 1.1 xmbdfed.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/xmbdfed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4918/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xmbdfed-4.7-linux.patch xmbdfed-4.7-patch1 
	xmbdfed-4.7-staticfix.patch xmbdfed.desktop xmbdfed.png 
	xmbdfed.spec 
Log Message:

initial commit



--- NEW FILE import.log ---
xmbdfed-4_7-3_fc11:HEAD:xmbdfed-4.7-3.fc11.src.rpm:1228944295

xmbdfed-4.7-linux.patch:

--- NEW FILE xmbdfed-4.7-linux.patch ---
diff -up xmbdfed-4.7/Makefile.BAD xmbdfed-4.7/Makefile
--- xmbdfed-4.7/Makefile.BAD	2008-11-20 11:42:27.000000000 -0500
+++ xmbdfed-4.7/Makefile	2008-11-20 11:45:16.000000000 -0500
@@ -46,9 +46,9 @@ OBJS = FGrid.o GEdit.o GEditTB.o GTest.o
 # Uncomment these if you have the FreeType library and want to use it to
 # import OpenType fonts.
 #
-#FTYPE_INCS = -I/usr/local/include
-#FTYPE_LIBS = -L/usr/local/lib -lfreetype
-#FTYPE_DEFS = -DHAVE_FREETYPE
+FTYPE_INCS = -I/usr/include/freetype2
+FTYPE_LIBS = -lfreetype
+FTYPE_DEFS = -DHAVE_FREETYPE
 
 #
 # Uncomment these if you have the hbf.h and hbf.c files in the current
@@ -89,8 +89,8 @@ LIBS = -R/usr/openwin/lib -R/usr/dt/lib 
 #
 # Uncomment these for Linux.
 #
-#INCS = -I/usr/X11/include $(FTYPE_INCS)
-#LIBS = -L/usr/X11/lib -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)
+INCS = $(FTYPE_INCS)
+LIBS = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)
 
 #
 # Uncomment these for HPUX.


--- NEW FILE xmbdfed-4.7-patch1 ---
Index: FGrid.c
===================================================================
RCS file: /home/sml/cvsrep/misc/xmbdfed/FGrid.c,v
retrieving revision 1.28
diff -u -r1.28 FGrid.c
--- FGrid.c	8 Feb 2004 23:58:59 -0000	1.28
+++ FGrid.c	2 Mar 2004 17:59:28 -0000
@@ -4267,7 +4267,7 @@
     pi->sel_start = pi->sel_end = cb.start;
     Select(pi->sel_start, pi->selmap);
 
-    _XmuttFGridDrawCells(fw, pi->sel_start, pi->sel_end, True, True);
+    _XmuttFGridDrawCells(fw, cb.start, cb.end, True, True);
 
     /*
      * Call the modified callback.

xmbdfed-4.7-staticfix.patch:

--- NEW FILE xmbdfed-4.7-staticfix.patch ---
diff -up xmbdfed-4.7/setup.c.BAD xmbdfed-4.7/setup.c
--- xmbdfed-4.7/setup.c.BAD	2008-11-20 11:49:43.000000000 -0500
+++ xmbdfed-4.7/setup.c	2008-11-20 11:49:47.000000000 -0500
@@ -92,7 +92,7 @@ typedef struct {
     Boolean saved;
 } MXFEditorSetup;
 
-static unsigned long active_editor;
+unsigned long active_editor;
 static MXFEditorSetup setup;
 static MXFEditorOtherOptions other;
 


--- NEW FILE xmbdfed.desktop ---
[Desktop Entry]
Exec=xmbdfed
Icon=xmbdfed
Terminal=false
Name=XmBDFEditor
GenericName=Bitmap Font Editor
Comment=Bitmap Font Editor
Type=Application
Categories=Graphics;
StartupNotify=true
X-Desktop-File-Install-Version=0.10


--- NEW FILE xmbdfed.spec ---
Name:		xmbdfed
Summary: 	Bitmap Font Editor
Version:	4.7
Release:	3%{?dist}
License:	MIT
Group:		Applications/System
Source0:	http://crl.nmsu.edu/~mleisher/%{name}-%{version}.tar.bz2
Source1:	http://crl.nmsu.edu/~mleisher/%{name}.png
Source2:	xmbdfed.desktop
Patch0:		http://crl.nmsu.edu/~mleisher/%{name}-4.7-patch1
Patch1:		xmbdfed-4.7-linux.patch
Patch2:		xmbdfed-4.7-staticfix.patch
URL:		http://crl.nmsu.edu/~mleisher/xmbdfed.html
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	freetype-devel, lesstif-devel, libXpm-devel, libXmu-devel
BuildRequires:	libXext-devel, libX11-devel, libSM-devel, libICE-devel
BuildRequires:	desktop-file-utils
Requires:	xorg-x11-fonts-misc

%description
The XmBDFEditor lets you interactively create new bitmap font files or 
modify existing ones. It allows editing multiple fonts and multiple 
glyphs, it allows cut and paste operations between fonts and glyphs and 
editing font properties. The editor works natively with BDF fonts.

%prep
%setup -q 
%patch0 -p0 -b .patch1
%patch1 -p1 -b .linux
%patch2 -p1 -b .staticfix

%build
make %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -p -m0755 xmbdfed %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man1
install -p -m0644 xmbdfed.man %{buildroot}%{_mandir}/man1
mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -p -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
desktop-file-install					\
	--dir %{buildroot}%{_datadir}/applications	\
	%{SOURCE2}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README COPYRIGHTS xmbdfedrc CHANGES
%{_bindir}/xmbdfed
%{_datadir}/pixmaps/xmbdfed.png
%{_datadir}/applications/*.desktop
%{_mandir}/man1/xmbdfed*

%changelog
* Wed Dec 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.7-3
- add -p to install to preserve timestamps
- add BR: desktop-file-utils

* Mon Dec  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.7-2
- correct usage of defattr
- add Requires: xorg-x11-fonts-misc
- fix desktop file

* Thu Nov 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.7-1
- initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmbdfed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Dec 2008 21:24:57 -0000	1.1
+++ .cvsignore	10 Dec 2008 21:27:21 -0000	1.2
@@ -0,0 +1 @@
+xmbdfed-4.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmbdfed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Dec 2008 21:24:57 -0000	1.1
+++ sources	10 Dec 2008 21:27:21 -0000	1.2
@@ -0,0 +1 @@
+27872bb7473e5d64d9a24281ae6ad3d9  xmbdfed-4.7.tar.bz2