[mot-adms] Update to 2.3.2

Sun Jul 20 15:33:05 UTC 2014

commit 8e08fa0b7ebe575767d959b33f015a769eaa3653
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Jul 20 16:31:55 2014 +0100

    Update to 2.3.2

 .gitignore                       |    1 +
 mot-adms-remove-BR-perl-GD.patch |   71 +++++++++++++++++++------------------
 mot-adms.spec                    |   40 ++++++++-------------
 sources                          |    2 +-
 4 files changed, 54 insertions(+), 60 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index d976feb..02e722c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /mot-adms.tar.gz
+/adms-2.3.2.tar.gz
diff --git a/mot-adms-remove-BR-perl-GD.patch b/mot-adms-remove-BR-perl-GD.patch
index ba1291e..2560adf 100644
--- a/mot-adms-remove-BR-perl-GD.patch
+++ b/mot-adms-remove-BR-perl-GD.patch
@@ -1,41 +1,42 @@
---- adms_orig/configure.ac	2010-08-01 21:57:05.390625000 +0200
-+++ adms/configure.ac	2010-08-01 21:31:51.046875000 +0200
-@@ -584,14 +584,14 @@
-     else
-       AC_MSG_RESULT(ok)
-     fi
--    AC_MSG_CHECKING(for GD Perl module)
--    have_gd="`$PERL -MGD -e 'exit 0;' >/dev/null 2>&1`"
--    if test $? != "0"; then
--      AC_MSG_RESULT(failed)
--      AC_MSG_ERROR([Perl package GD:: may be downloaded from http://search.cpan.org/dist/GD])
--    else
--      AC_MSG_RESULT(ok)
--    fi
-+#    AC_MSG_CHECKING(for GD Perl module)
-+#    have_gd="`$PERL -MGD -e 'exit 0;' >/dev/null 2>&1`"
-+#    if test $? != "0"; then
-+#      AC_MSG_RESULT(failed)
-+#      AC_MSG_ERROR([Perl package GD:: may be downloaded from http://search.cpan.org/dist/GD])
-+#    else
-+#      AC_MSG_RESULT(ok)
-+#    fi
-   fi
+--- adms-2.3.2/configure.ac.orig	2014-07-20 12:14:38.813866179 +0100
++++ adms-2.3.2/configure.ac	2014-07-20 12:15:47.073986623 +0100
+@@ -24,7 +24,7 @@
+ # Automake Initialisation.
+ AM_INIT_AUTOMAKE
+ 
+-# Maintainer mode is used to detect/run Perl (XML::LibXml and GD modules) and make dist tarball
++# Maintainer mode is used to detect/run Perl (XML::LibXml module) and make dist tarball
+ AM_MAINTAINER_MODE
+ 
+ AX_PROG_FLEX([],[AC_MSG_WARN(Program flex not found (found $LEX))
+@@ -84,7 +84,7 @@
+ AC_PROG_LIBTOOL
+ AC_SUBST([LIBTOOL_DEPS])
+ 
+-dnl Perl, XML::LibXML and GD modules required for maintainer
++dnl Perl, XML::LibXML module required for maintainer
+ if test $USE_MAINTAINER_MODE = yes; then
+ 
+   AC_PATH_PROG(PERL, perl, :)
+@@ -95,8 +95,6 @@
+   AX_PERL_MODULE_VERSION([XML::LibXML 2],[],[
+       AC_MSG_RESULT(failed)
+       AC_MSG_ERROR([Perl package XML::LibXML may be downloaded from http://search.cpan.org/dist/libXML])])
+-  AX_PERL_MODULE_VERSION([GD 2.4],[],[
+-      AC_MSG_ERROR([Perl package GD:: may be downloaded from http://search.cpan.org/dist/GD])])
  fi
-
---- adms_orig/images/Makefile.am	2010-08-01 21:57:04.390625000 +0200
-+++ adms/images/Makefile.am	2010-08-01 21:22:18.031250000 +0200
-@@ -96,9 +96,9 @@
- generated_FILES=adms-scalar.png adms-element.png adms-enumeration.png adms-uid.png adms-alias.png
+ 
+ AC_CONFIG_FILES([Makefile
+--- adms-2.3.2/images/Makefile.am.orig	2014-07-20 12:14:23.428613664 +0100
++++ adms-2.3.2/images/Makefile.am	2014-07-20 12:16:24.456600306 +0100
+@@ -8,10 +8,4 @@
+ 
  EXTRA_DIST=mkimages.pl $(generated_FILES)
-
+ 
+-# Perl GD module only required for maintainers
 -if MAINTAINER_MODE
 -$(generated_FILES): ${srcdir}/mkimages.pl
 -	$(PERL) ${srcdir}/mkimages.pl
 -endif
-+# if MAINTAINER_MODE
-+# $(generated_FILES): ${srcdir}/mkimages.pl
-+# 	$(PERL) ${srcdir}/mkimages.pl
-+# endif
-
- CLEANFILES=core .*.swp *\~
+-
+ CLEANFILES=core .*.swp *\~ $(generated_FILES)
diff --git a/mot-adms.spec b/mot-adms.spec
index 712c55c..0dc0ed1 100644
--- a/mot-adms.spec
+++ b/mot-adms.spec
@@ -1,25 +1,22 @@
 # This package is part of the Free Electronic Lab.
 
 Name:           mot-adms
-Version:        2.2.9
-Release:        7.svn1186%{?dist}
+Version:        2.3.2
+Release:        1%{?dist}
 Summary:        An electrical compact device models converter
 
 Group:          Applications/Engineering
 License:        LGPLv2+
 URL:            http://mot-adms.sourceforge.net/
 
-#Source0:        http://downloads.sourceforge.net/sourceforge/%{_name}/%{name}-%{version}.tar.gz
-Source0:        mot-adms.tar.gz
-# The above source file can be download with this Tcl script
-Source1:        mot-adms-download.tcl
+Source0:        http://sourceforge.net/projects/mot-adms/files/adms-source/2.3/adms-%{version}.tar.gz
 
 # Remove useless perl-GD dependency
 Patch0:         mot-adms-remove-BR-perl-GD.patch
+Patch1:         mot-adms-format-security.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  flex bison perl-XML-LibXML automake libtool
+BuildRequires:  flex bison perl-XML-LibXML
+BuildRequires:  automake autoconf libtool
 
 %description
 ADMS is a code generator that converts electrical compact
@@ -29,38 +26,30 @@ Based on transformations specified in XML language, ADMS
 transforms Verilog-AMS code into other target languages.
 
 %prep
-%setup -q -n %name
+%setup -q -n adms-%{version}
 
 %patch0 -p1 -b .perlGD
-
-# minor cleanups and preparations
-rm -rf auxconf && mkdir auxconf
-%{__autoheader}
-%{__libtoolize} --force --copy
-%{__aclocal}
-touch ChangeLog
-%{__automake} --add-missing -c
-%{__autoconf}
+%patch1 -p1 -b .format-security
+mv README.md README
 
 %build
+autoreconf -vif
 %configure \
     --disable-static \
     --enable-maintainer-mode \
     --libdir=%{_libdir}/%{name}
+
 # not parallel build safe
 make
 # %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
 make INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}
 
 #find  %{buildroot}/%{_libdir} -name "*.la" -exec rm -f {} \;
 #find  %{buildroot}/%{_libdir} -name "*.a"  -exec rm -f {} \;
 
-%clean
-rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -69,13 +58,16 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ABOUT-NLS AUTHORS COPYING TODO README NEWS
+%doc AUTHORS COPYING TODO README ChangeLog
 %{_bindir}/admsXml
 %{_libdir}/%{name}
 %{_mandir}/man1/admsXml.1.gz
-
+%{_mandir}/man1/admsCheck.1.gz
 
 %changelog
+* Thu Jul 17 2014 Peter Robinson <pbrobinson at fedoraproject.org> 2.3.2-1
+- Update to 2.3.2
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.9-7.svn1186
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 82bbd70..b7dc4f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d9da6573c93710e5971bd5d7ff29b9cf  mot-adms.tar.gz
+844c03da9b6f46f283b44969da66b43e  adms-2.3.2.tar.gz
