rpms/chemtool/F-7 chemtool-gmd.patch, NONE, 1.1 chemtool-compile.patch, 1.1, 1.2 chemtool.spec, 1.4, 1.5 sources, 1.3, 1.4
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Tue Oct 23 23:03:45 UTC 2007
Author: rathann
Update of /cvs/pkgs/rpms/chemtool/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15555
Modified Files:
chemtool-compile.patch chemtool.spec sources
Added Files:
chemtool-gmd.patch
Log Message:
- updated to 1.6.11
- updated license tag
- specfile cleanups
- fixed GNOME dir detection
- drop libEMF dependency (current transfig/fig2dev supports EMF output)
chemtool-gmd.patch:
--- NEW FILE chemtool-gmd.patch ---
--- chemtool-1.6.11/configure.gmd 2007-08-26 13:53:59.000000000 +0200
+++ chemtool-1.6.11/configure 2007-08-26 20:12:33.000000000 +0200
@@ -8398,7 +8398,7 @@ echo "${ECHO_T}apparently in $GNOMEMIMED
gnomemimedir=$GNOMEMIMEDIR
fi
fi
-if test "x$GNOMEMIMEDIR" = "x" ; then
+if test "x$gnomemimedir" = "x" ; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
chemtool-compile.patch:
Index: chemtool-compile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/F-7/chemtool-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chemtool-compile.patch 21 Nov 2006 11:25:13 -0000 1.1
+++ chemtool-compile.patch 23 Oct 2007 23:03:39 -0000 1.2
@@ -1,5 +1,16 @@
---- 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
+--- chemtool-1.6.11/Makefile.in.compile 2007-08-26 13:53:59.000000000 +0200
++++ chemtool-1.6.11/Makefile.in 2007-08-26 20:37:00.000000000 +0200
+@@ -230,7 +230,7 @@ chemtool_SOURCES = main.c draw.c graph.c
+ AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@
+
+ # Link time dependencies.
+-LDADD = @LIBINTL@ @GTK_LIBS@
++LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@
+
+ # Additional files to be distributed.
+ EXTRA_DIST = autogen.sh autoclean.sh
+--- chemtool-1.6.11/src-cht/cht-2.5.c.compile 2007-08-26 13:49:26.000000000 +0200
++++ chemtool-1.6.11/src-cht/cht-2.5.c 2007-08-26 20:30:25.000000000 +0200
@@ -121,11 +121,6 @@
#define LACK_MEMMOVE
#define LACK_MEMCPY
@@ -12,7 +23,7 @@
#endif
#endif
-@@ -593,13 +588,15 @@
+@@ -593,13 +588,15 @@ char **argv;
/* In case your system lacks these... */
@@ -29,7 +40,7 @@
#ifdef __STDC__
Anyptr my_memmove(Anyptr d, Const Anyptr s, size_t n)
#else
-@@ -623,8 +620,9 @@
+@@ -623,8 +620,9 @@ register int n;
}
return d;
}
@@ -40,7 +51,7 @@
#ifdef __STDC__
Anyptr my_memcpy(Anyptr d, Const Anyptr s, size_t n)
#else
-@@ -638,7 +636,9 @@
+@@ -638,7 +636,9 @@ register int n;
*dd++ = *ss++;
return d;
}
@@ -50,7 +61,7 @@
#ifdef __STDC__
int my_memcmp(Const Anyptr s1, Const Anyptr s2, size_t n)
#else
-@@ -654,7 +654,9 @@
+@@ -654,7 +654,9 @@ register int n;
return i;
return 0;
}
@@ -60,7 +71,7 @@
#ifdef __STDC__
Anyptr my_memset(Anyptr d, int c, size_t n)
#else
-@@ -669,7 +671,7 @@
+@@ -669,7 +671,7 @@ register int n;
*dd++ = c;
return d;
}
@@ -69,8 +80,8 @@
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
+--- chemtool-1.6.11/inout.c.compile 2007-08-26 13:49:26.000000000 +0200
++++ chemtool-1.6.11/inout.c 2007-08-26 20:30:25.000000000 +0200
@@ -13,7 +13,7 @@
#include "gdk/gdkprivate.h"
#include <locale.h>
@@ -78,5 +89,5 @@
-#include <emf.h>
+#include <libEMF/emf.h>
#endif
-
- #ifdef GTK2
+ #ifdef DISABLE_NLS
+ #define _(Text) Text
Index: chemtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/F-7/chemtool.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- chemtool.spec 25 Apr 2007 16:32:22 -0000 1.4
+++ chemtool.spec 23 Oct 2007 23:03:39 -0000 1.5
@@ -1,17 +1,17 @@
Summary: A program for 2D drawing organic molecules
Name: chemtool
-Version: 1.6.10
+Version: 1.6.11
Release: 1%{?dist}
-License: GPL
+License: GPLv2+
Group: Applications/Editors
Source0: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/%{name}-%{version}.tar.gz
Patch0: %{name}-compile.patch
Patch1: %{name}-desktop.patch
+Patch2: %{name}-gmd.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
@@ -27,10 +27,10 @@
%setup -q
%patch0 -p1 -b .compile
%patch1 -p1 -b .d
+%patch2 -p1 -b .gmd
%build
%configure \
- --enable-emf \
--with-kdedir=%{_prefix} \
--with-gnomedir=%{_prefix}
%{__make} %{?_smp_mflags}
@@ -51,17 +51,15 @@
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
+install -p gnome/mime-types/chemtool.* $RPM_BUILD_ROOT%{_datadir}/mime-types
+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
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}
@@ -90,6 +88,13 @@
%{_mandir}/man1/*
%changelog
+* Wed Oct 24 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.11-1
+- updated to 1.6.11
+- updated license tag
+- specfile cleanups
+- fixed GNOME dir detection
+- drop libEMF dependency (current transfig/fig2dev supports EMF output)
+
* Wed Apr 25 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 1.6.10-1
- updated to 1.6.10
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chemtool/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 25 Apr 2007 16:32:22 -0000 1.3
+++ sources 23 Oct 2007 23:03:39 -0000 1.4
@@ -1 +1 @@
-a1ce4f8965bb349e0dd0bc53313b35a8 chemtool-1.6.10.tar.gz
+25c15b2ee73fc89b4e34cafd57daca31 chemtool-1.6.11.tar.gz
More information about the fedora-extras-commits
mailing list