[mscgen/f18] Initial import (#842064)

dwrobel dwrobel at fedoraproject.org
Thu Aug 16 17:49:31 UTC 2012


commit 7e40ef00c5f3d604a5a22d21638d1975a4be4c90
Author: Damian Wrobel <D.Wrobel at ertelnet.rybnik.pl>
Date:   Thu Aug 16 19:49:27 2012 +0200

    Initial import (#842064)

 .gitignore                           |    1 +
 mscgen-0.20-escape.patch             |   13 ++++
 mscgen-0.20-uninitialized-ymax.patch |   24 +++++++
 mscgen.spec                          |  116 ++++++++++++++++++++++++++++++++++
 sources                              |    1 +
 5 files changed, 155 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..0c3e0e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/mscgen-src-0.20.tar.gz
diff --git a/mscgen-0.20-escape.patch b/mscgen-0.20-escape.patch
new file mode 100644
index 0000000..95027f7
--- /dev/null
+++ b/mscgen-0.20-escape.patch
@@ -0,0 +1,13 @@
+Index: mscgen-0.20/src/usage.c
+===================================================================
+--- mscgen-0.20.orig/src/usage.c	2011-03-01 22:16:04.000000000 +0100
++++ mscgen-0.20/src/usage.c	2012-07-20 23:53:25.415071528 +0200
+@@ -59,7 +59,7 @@ void Usage(void)
+ "              command line.\n"
+ " -o <file>   Write output to the named file.  This option must be specified if \n"
+ "              input is taken from stdin, otherwise the output filename\n"
+-"              defaults to <infile>.<type>.  This may also be specified as '\-'\n"
++"              defaults to <infile>.<type>.  This may also be specified as '-'\n"
+ "              to write output directly to stdout.\n"
+ #ifdef USE_FREETYPE
+ " -F <font>   Use specified font for PNG output.  This must be a font specifier\n"
diff --git a/mscgen-0.20-uninitialized-ymax.patch b/mscgen-0.20-uninitialized-ymax.patch
new file mode 100644
index 0000000..a57ca00
--- /dev/null
+++ b/mscgen-0.20-uninitialized-ymax.patch
@@ -0,0 +1,24 @@
+Index: mscgen/src/main.c
+===================================================================
+--- mscgen/src/main.c	(revision 195)
++++ mscgen/src/main.c	(revision 196)
+@@ -851,6 +851,7 @@
+ 
+     nextYmin = ymin = gOpts.entityHeadGap;
+     yskipmax = 0;
++    ymax = 0;
+ 
+     MscResetArcIterator(m);
+     do
+Index: mscgen/ChangeLog
+===================================================================
+--- mscgen/ChangeLog	(revision 195)
++++ mscgen/ChangeLog	(revision 196)
+@@ -1,3 +1,7 @@
++0.21:
++      Apply patch from damian.sparrow to fix warning in usage.c (issue #72).
++      Fix lack of initialisation for ymax producing a compiler warning (issue
++      #73).
+ 0.20: 05/03/2011
+       Fix spelling errors (issue #58)
+       Add a MSC validation phase to check that all the entity names are known
diff --git a/mscgen.spec b/mscgen.spec
new file mode 100644
index 0000000..78746a8
--- /dev/null
+++ b/mscgen.spec
@@ -0,0 +1,116 @@
+Name:           mscgen
+Version:        0.20
+Release:        3%{?dist}
+Group:          Development/Tools
+Summary:        Message Sequence Chart rendering program
+License:        GPLv2+
+URL:            http://www.mcternan.me.uk/mscgen/
+Source0:        http://www.mcternan.me.uk/mscgen/software/%{name}-src-%{version}.tar.gz
+
+# Removes unknown escape sequence '\-'
+# Patch sent upstream.
+# http://code.google.com/p/mscgen/issues/detail?id=72
+Patch0:         %{name}-0.20-escape.patch
+
+# Fixes 'ymax' variable initialization
+# http://code.google.com/p/mscgen/issues/detail?id=73
+Patch1:         %{name}-0.20-uninitialized-ymax.patch
+
+
+%global test_with_valgrind %{?_with_valgrind:1}%{!?_with_valgrind:0}
+
+
+BuildRequires:  flex
+BuildRequires:  bison
+BuildRequires:  pkgconfig
+BuildRequires:  gd-devel
+BuildRequires:  freetype-devel
+BuildRequires:  urw-fonts
+
+%if %{test_with_valgrind}
+BuildRequires:  valgrind
+%endif
+
+# Freetype based font rendering requires some fonts to be installed.
+Requires:       urw-fonts
+
+
+%description
+Mscgen is a small program that parses Message Sequence Chart descriptions
+and produces PNG, SVG, EPS or server side image maps (ismaps) as the output.
+Message Sequence Charts (MSCs) are a way of representing entities and
+interactions over some time period and are often used in combination with SDL.
+MSCs are popular in Telecoms to specify how protocols operate although MSCs
+need not be complicated to create or use. Mscgen aims to provide a simple text
+language that is clear to create, edit and understand, which can also be
+transformed into common image formats for display or printing.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .escape
+%patch1 -p1 -b .initialization
+#this ensures that they get regenerated
+rm -f src/language.{c,h} src/lexer.c
+
+
+%build
+# Correct EOL.
+sed -i 's/\r//' TODO
+%configure \
+    --with-freetype \
+    --docdir=%{_defaultdocdir}/%{name}-%{version}
+make %{?_smp_mflags}
+
+
+%check
+%if %{test_with_valgrind}
+export VALGRIND="valgrind -v --track-origins=yes --tool=memcheck"
+%endif
+make check
+
+
+%install
+make install INSTALL="install -p" DESTDIR=%{buildroot}
+cp -p TODO %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+
+
+%files
+# due to this entry, doc must not be used to add any other files
+%{_defaultdocdir}/%{name}-%{version}/
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}*
+
+
+%changelog
+* Mon Aug 16 2012 Damian Wrobel <dwrobel at ertelnet.rybnik.pl> - 0.20-3
+- use force option while removing files,
+- install TODO file,
+- use %%{name} macro on PatchX,
+- preserve timestamps while installing files,
+- add a comment about the uwr-fonts requirement,
+- backport fix for variable initialization.
+
+* Fri Jul 20 2012 Damian Wrobel <dwrobel at ertelnet.rybnik.pl> - 0.20-2
+- remove superfluous spaces from the spec file,
+- correct the Group,
+- use consistently marcos,
+- unknown escape sequence removal patch added,
+- remove files which has to be regenerated,
+- build with the free-type support,
+- add a possibility to run tests under valgrind.
+
+* Mon Jan 3 2011 Michael McTernan <Michael.McTernan.2001 at cs.bris.ac.uk> 0.19-2
+- Add comment in spec file warning of doc use.
+
+* Wed Sep 15 2010 Michael McTernan <Michael.McTernan.2001 at cs.bris.ac.uk> 0.19-1
+- Version bump following upstream release.
+
+* Tue Sep 07 2010 Michael McTernan <Michael.McTernan.2001 at cs.bris.ac.uk> 0.18-3
+- Further Fedora packaging fixes to remove duplicate doc (bug #630754#c4).
+
+* Tue Sep 07 2010 Michael McTernan <Michael.McTernan.2001 at cs.bris.ac.uk> 0.18-2
+- Fixes from Fedora packaging review (bug #630754).
+
+* Thu Aug 25 2010 Michael McTernan <Michael.McTernan.2001 at cs.bris.ac.uk> 0.18-1
+- Initial version.
diff --git a/sources b/sources
index e69de29..0010d64 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+65c90fb5150d7176b65b793f0faa7377  mscgen-src-0.20.tar.gz


More information about the scm-commits mailing list