rpms/fig2sxd/F-9 fig2sxd-makefile.patch, NONE, 1.1 fig2sxd.patch, NONE, 1.1 fig2sxd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Paul F. Johnson (pfj)]

Author: pfj

Update of /cvs/pkgs/rpms/fig2sxd/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23012/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	fig2sxd-makefile.patch fig2sxd.patch fig2sxd.spec 
Log Message:

Initial import 


fig2sxd-makefile.patch:

--- NEW FILE fig2sxd-makefile.patch ---
--- fig2sxd-0.18/Makefile	2008-05-16 23:47:34.000000000 +0100
+++ fig2sxd-0.18/Makefile-new	2008-05-19 10:04:52.000000000 +0100
@@ -46,7 +46,7 @@
 
 
 CXX = g++
-CXXFLAGS = -Wall -W -O2 -g
+CXXFLAGS = $(CFLAGS)
 CXXFLAGS += $(INCLUDES)
 LIBS = -lz
 
@@ -67,9 +67,9 @@
 all: install
 
 install: $(TARGET1) fig2sxd.1
-	install -d $(DESTDIR)/bin $(DESTDIR)/share/man/man1
-	install -m755 $(TARGET1) $(DESTDIR)/bin
-	install -m644 fig2sxd.1  $(DESTDIR)/share/man/man1
+	install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/share/man/man1
+	install -m755 $(TARGET1) $(DESTDIR)/usr/bin
+	install -m644 fig2sxd.1  $(DESTDIR)/usr/share/man/man1
 
 tgz:
 	tar czf `date +"../fig2sxd-%Y-%m-%d-%H-%M.tar.gz"` -C $(SRCDIR)../ \

fig2sxd.patch:

--- NEW FILE fig2sxd.patch ---
--- fig2sxd-0.17.orig/fig2sxd.cpp	2007-05-16 15:55:48.000000000 +0100
+++ fig2sxd-0.17.orig/fig2sxd-new.cpp	2008-04-22 12:07:23.000000000 +0100
@@ -30,5 +30,6 @@
 #include <fstream>
 #include <sstream>
 #include <vector>
+#include <cstring>
 
 using namespace std;


--- NEW FILE fig2sxd.spec ---
Name:           fig2sxd
Version:        0.18
Release:        2%{?dist}
Summary:        A fig to sxd file converter
Group:          System Environment/Libraries
License:        GPLv2
Patch0:		fig2sxd.patch
Patch1:		fig2sxd-makefile.patch
URL:            http://fig2sxd.sf.net
BuildRequires:	zlib-devel
Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
Fig2Sxd converts fig files to OpenOffice Draw format. It can work 
alone or as a plugin for chemtool

%prep
%setup -q 
%patch0 -p1 -b .orig
%patch1 -p1 -b .orig

%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"

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

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/fig2sxd
%{_mandir}/man1/fig2sxd.1.gz


%changelog
* Tue May 20 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.18-2
- fix URL

* Fri May 16 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.18-1
- fix for position of elements when brought into OOo Draw

* Tue May 13 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.17-2
- fix for zlib-devel
- fix for makefile

* Tue Apr 22 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.17-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fig2sxd/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 May 2008 16:05:05 -0000	1.1
+++ .cvsignore	2 Jun 2008 15:18:55 -0000	1.2
@@ -0,0 +1 @@
+fig2sxd_0.18.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fig2sxd/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 May 2008 16:05:05 -0000	1.1
+++ sources	2 Jun 2008 15:18:55 -0000	1.2
@@ -0,0 +1 @@
+42fcdc479ae369c6430f44b15e16e2db  fig2sxd_0.18.orig.tar.gz