rpms/chemtool/devel chemtool-compile.patch, NONE, 1.1 chemtool-desktop.patch, NONE, 1.1 chemtool.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tue Nov 21 11:25:44 UTC 2006

Author: rathann

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

Modified Files:
	.cvsignore sources 
Added Files:
	chemtool-compile.patch chemtool-desktop.patch chemtool.spec 
Log Message:
auto-import chemtool-1.6.9-5 on branch devel from chemtool-1.6.9-5.src.rpm

chemtool-compile.patch:

--- NEW FILE chemtool-compile.patch ---
--- chemtool-1.6.9/src-cht/cht-2.5.c.compile	2006-01-23 21:05:41.000000000 +0100
+++ chemtool-1.6.9/src-cht/cht-2.5.c	2006-11-19 01:11:59.000000000 +0100
@@ -121,11 +121,6 @@
 #define LACK_MEMMOVE
 #define LACK_MEMCPY
 
-#else
-
-#define LACK_LABS       /* Undefine these if your library has these */
-#define LACK_MEMMOVE
-
 #endif
 #endif
 
@@ -593,13 +588,15 @@
 
 /* In case your system lacks these... */
 
+#ifdef LACK_LABS
 long my_labs(x)
 long x;
 {
     return((x > 0) ? x : -x);
 }
+#endif /* LACK_LABS */
 
-
+#ifdef LACK_MEMMOVE
 #ifdef __STDC__
 Anyptr my_memmove(Anyptr d, Const Anyptr s, size_t n)
 #else
@@ -623,8 +620,9 @@
     }
     return d;
 }
+#endif /* LACK_MEMMOVE */
 
-
+#ifdef LACK_MEMCPY
 #ifdef __STDC__
 Anyptr my_memcpy(Anyptr d, Const Anyptr s, size_t n)
 #else
@@ -638,7 +636,9 @@
 	*dd++ = *ss++;
     return d;
 }
+#endif /* LACK_MEMCPY */
 
+#ifdef LACK_MEMCMP
 #ifdef __STDC__
 int my_memcmp(Const Anyptr s1, Const Anyptr s2, size_t n)
 #else
@@ -654,7 +654,9 @@
 	    return i;
     return 0;
 }
+#endif /* LACK_MEMCMP */
 
+#ifdef LACK_MEMSET
 #ifdef __STDC__
 Anyptr my_memset(Anyptr d, int c, size_t n)
 #else
@@ -669,7 +671,7 @@
 	*dd++ = c;
     return d;
 }
-
+#endif /* LACK_MEMSET */
 
 int my_toupper(c)
 int c;
--- chemtool-1.6.9/inout.c.compile	2006-02-27 22:36:58.000000000 +0100
+++ chemtool-1.6.9/inout.c	2006-11-19 01:16:12.000000000 +0100
@@ -13,7 +13,7 @@
 #include "gdk/gdkprivate.h"
 #include <locale.h>
 #ifdef EMF
-#include <emf.h>
+#include <libEMF/emf.h>
 #endif
 
 #ifdef GTK2

chemtool-desktop.patch:

--- NEW FILE chemtool-desktop.patch ---
--- chemtool-1.6.9/pld/chemtool.desktop.d	2006-01-23 21:05:41.000000000 +0100
+++ chemtool-1.6.9/pld/chemtool.desktop	2006-11-19 01:35:05.000000000 +0100
@@ -1,15 +1,14 @@
 [Desktop Entry]
 Name=Chemtool
 Comment=Molecules 2D drawing program
-Name[cs_CZ.ISO8859-2]=Chemtool
-Comment[cs_CZ.ISO8859-2]=Editor molekul
-Comment[de_DE.ISO8859-1]=Moleküleditor
-Comment[pl_PL.ISO8859-2]=Edytor molekó³
+Comment[cs]=Editor molekul
+Comment[de]=MolekÃ¼leditor
+Comment[pl]=Edytor molekuÅ‚
 Exec=chemtool
 Icon=chemtool.xpm
 Terminal=false
-MultipleArgs=false
+Encoding=UTF-8
 Type=Application
 MimeType=application/x-chemtool;Application
-InitialPreference=2
+X-InitialPreference=2
 


--- NEW FILE chemtool.spec ---
Summary: A program for 2D drawing organic molecules
Name: chemtool
Version: 1.6.9
Release: 5%{?dist}
License: GPL
Group: Applications/Editors
Source0: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/%{name}-%{version}.tar.gz
Patch0: %{name}-compile.patch
Patch1: %{name}-desktop.patch
URL: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
BuildRequires: libEMF-devel
BuildRequires: libXt-devel
BuildRequires: gnome-mime-data
BuildRequires: kdelibs
Requires: openbabel
Requires: transfig

%description
Chemtool is a program for drawing organic molecules easily and store them
in a variety of output formats including as a X bitmap, Xfig, SVG or EPS
file.  It runs under the X Window System using the GTK widget set.

%prep
%setup -q
%patch0 -p1 -b .compile
%patch1 -p1 -b .d

%build
%configure \
  --enable-emf \
  --with-kdedir=%{_prefix} \
  --with-gnomedir=%{_prefix}
%{__make} %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_datadir}/{applications,mimelnk/application,mime-info,mime-types,pixmaps} \
        $RPM_BUILD_ROOT{%{_datadir}/icons/hicolor/{32x32/mimetypes,48x48/apps}}

# fix line endings
pushd examples
tr -d '\r' < 14263232.mol > 14263232.mol.unix && mv -f 14263232.mol.unix 14263232.mol
tr -d '\r' < sample.sdf > sample.sdf.unix && mv -f sample.sdf.unix sample.sdf
popd

%{__make} DESTDIR=$RPM_BUILD_ROOT install

install -p kde/mimelnk/application/x-chemtool.desktop     $RPM_BUILD_ROOT%{_datadir}/mimelnk/application
install -p kde/icons/hicolor/32x32/mimetypes/chemtool.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/mimetypes
desktop-file-install --vendor=fedora \
                     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
                     --add-category=Education \
                     --add-category=Science \
                     --add-category=Chemistry \
                     pld/chemtool.desktop
install -p gnome/gnome-application-chemtool.png           $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/chemtool.png
install -p chemtool.xpm                                   $RPM_BUILD_ROOT%{_datadir}/pixmaps

%{__rm} $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/chemtool.desktop
%{__rm} $RPM_BUILD_ROOT%{_datadir}/pixmaps/mc/gnome-application-chemtool.png

%find_lang %{name}

%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_bindir}/update-desktop-database &> /dev/null ||:

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_bindir}/update-desktop-database &> /dev/null ||:

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(644,root,root,755)
%doc ChangeLog README TODO examples
%attr(755,root,root) %{_bindir}/*
%{_datadir}/mimelnk/application/*
%{_datadir}/mime-types/chemtool.*
%{_datadir}/pixmaps/*.xpm
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/applications/*.desktop
%{_mandir}/man1/*

%changelog
* Mon Nov 20 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.9-5
- keep the whole examples dir in docs
- add update-desktop-database call to post{,un} scripts

* Mon Nov 20 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.9-4
- fix build without mock

* Sun Nov 19 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.9-3
- added missing BRs
- add scriptlets to update icon cache

* Sun Nov 19 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.9-2
- don't use non-standard macros

* Fri Nov 17 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.9-1
- initial build, based on bioxray.dk and PLD specfiles


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chemtool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 11:21:17 -0000	1.1
+++ .cvsignore	21 Nov 2006 11:25:13 -0000	1.2
@@ -0,0 +1 @@
+chemtool-1.6.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chemtool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 11:21:17 -0000	1.1
+++ sources	21 Nov 2006 11:25:13 -0000	1.2
@@ -0,0 +1 @@
+d13b16c019a9912cf0c3de07ca5bcd29  chemtool-1.6.9.tar.gz


