Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package adms for openSUSE:Factory checked in at 2021-02-09 21:16:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/adms (Old) and /work/SRC/openSUSE:Factory/.adms.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "adms" Tue Feb 9 21:16:50 2021 rev:7 rq:870329 version:2.3.7 Changes: -------- --- /work/SRC/openSUSE:Factory/adms/adms.changes 2018-08-10 09:50:51.638374685 +0200 +++ /work/SRC/openSUSE:Factory/.adms.new.28504/adms.changes 2021-02-09 21:16:51.922814808 +0100 @@ -1,0 +2,9 @@ +Tue Jan 5 21:03:18 UTC 2021 - Matthias Eliasson <eli...@opensuse.org> + +- update to version 2.3.7 + * reproducible build + * typo fixes + * include path + * instructions + +------------------------------------------------------------------- Old: ---- adms-2.3.6.tar.gz New: ---- adms-2.3.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ adms.spec ++++++ --- /var/tmp/diff_new_pack.64puR2/_old 2021-02-09 21:16:52.466815426 +0100 +++ /var/tmp/diff_new_pack.64puR2/_new 2021-02-09 21:16:52.474815435 +0100 @@ -1,7 +1,7 @@ # # spec file for package adms # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define sover 0 Name: adms -Version: 2.3.6 +Version: 2.3.7 Release: 0 Summary: An automatic device model synthesizer License: GPL-3.0-only Group: Productivity/Scientific/Electronics -URL: http://sourceforge.net/projects/mot-adms/ +URL: https://sourceforge.net/projects/mot-adms/ Source0: https://github.com/Qucs/ADMS/archive/release-%{version}/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE adms-no-build-time.patch -- remove build time from binary Patch1: adms-no-build-time.patch @@ -68,7 +68,7 @@ %build ./bootstrap.sh %configure --enable-maintainer-mode --disable-static -make %{?_smp_mflags} +%make_build %install %make_install ++++++ adms-2.3.6.tar.gz -> adms-2.3.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/.appveyor.yml new/ADMS-release-2.3.7/.appveyor.yml --- old/ADMS-release-2.3.6/.appveyor.yml 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/.appveyor.yml 2020-08-18 11:28:13.000000000 +0200 @@ -28,7 +28,7 @@ ## Build - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && ./bootstrap.sh" - - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && ./configure --enable-maintainer-mode --prefix=/c/adms-win%MBITS% --disable-shared" + - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && ./configure --prefix=/c/adms-win%MBITS% --disable-shared" - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && make distcheck" - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && make install" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/.travis.yml new/ADMS-release-2.3.7/.travis.yml --- old/ADMS-release-2.3.6/.travis.yml 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/.travis.yml 2020-08-18 11:28:13.000000000 +0200 @@ -28,13 +28,13 @@ - case $BUILD_SYSTEM in autotools) ./bootstrap.sh && - ./configure --enable-maintainer-mode --prefix=/usr && + ./configure --prefix=/usr && make distcheck && sudo make install ;; cmake) mkdir build && cd build && - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DUSE_MAINTAINER_MODE=ON && + cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make && sudo make install ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/CMakeLists.txt new/ADMS-release-2.3.7/CMakeLists.txt --- old/ADMS-release-2.3.6/CMakeLists.txt 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/CMakeLists.txt 2020-08-18 11:28:13.000000000 +0200 @@ -27,12 +27,13 @@ PROJECT(ADMS C) cmake_minimum_required(VERSION 2.8) +# TODO: store version in a sensible place +# e.g. qucs: file(STRINGS "${qucs-project_SOURCE_DIR}/VERSION" QUCS_VERSION) + SET(PACKAGE_NAME "adms") -SET(PACKAGE_VERSION "2.3.6") +SET(PACKAGE_VERSION "2.3.7") SET(PACKAGE_BUGREPORT "qucs-b...@lists.sourceforge.net") -OPTION ( USE_MAINTAINER_MODE "Enable generation of code (parser source) from Perl scripts." OFF ) - # Default to static libs ( shared needs work, BUG with MinGW). OPTION ( BUILD_STATIC_LIBS "Build static libraries." ON ) IF ( MINGW ) @@ -54,20 +55,18 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) -# Only care about Perl in case maintainer needs to recreate sources +# Perl is used to recreate sources # * mkelements.pl # * mktext.pl # * mkgrammar.pl -if ( USE_MAINTAINER_MODE ) - # Checking for perl modules requires FindPerlModules.cmake - # Check all required modules at once - SET(CMAKE_MODULE_PATH "${ADMS_SOURCE_DIR}/cmake/modules") - include(FindPerlModules) - find_package(PerlModules COMPONENTS XML::LibXML) - if(NOT PERLMODULES_FOUND) - message(FATAL_ERROR "Not all required perl modules were found on your system") - endif(NOT PERLMODULES_FOUND) -endif ( USE_MAINTAINER_MODE ) +# Checking for perl modules requires FindPerlModules.cmake +# Check all required modules at once +SET(CMAKE_MODULE_PATH "${ADMS_SOURCE_DIR}/cmake/modules") +include(FindPerlModules) +find_package(PerlModules COMPONENTS XML::LibXML) +if(NOT PERLMODULES_FOUND) + message(FATAL_ERROR "Not all required perl modules were found on your system") +endif(NOT PERLMODULES_FOUND) find_package(BISON 2.5) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/ChangeLog new/ADMS-release-2.3.7/ChangeLog --- old/ADMS-release-2.3.6/ChangeLog 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/ChangeLog 2020-08-18 11:28:13.000000000 +0200 @@ -1,5 +1,5 @@ adms-2.3.6: - * Fix parser for parameter lists in subdevice instanciation. + * Fix parser for parameter lists in subdevice instantiation. * Remove duplicated constants on provided headers. * Fix crash on x64 when printing the message about standard headers. @@ -20,11 +20,11 @@ * Autotools, add back support for static and shared libraries build. * Build shared libraries by default. Tested on Linux, Mac OSX, and MSYS2. See the configure --disable-shared flag to change that. - * CMake contiues to builds static libraries only. + * CMake continues to builds static libraries only. * Fix out-of-tree build for Autotools and CMake. - * Check scaling factors againd LRM v2.4.0 + * Check scaling factors against LRM v2.4.0 * Add missing K scaling (uppercase kilo) * standard scale_factor T|G|M|K|k|m|u|n|p|f|a * Add testset (va and xml files) to test the scaling factors @@ -49,7 +49,7 @@ * avoid spurious fatal error from an included file which last line contains onlywhite space. * preprocessorYacc.y: - * fix BSIM6 parse problem, string macro arg broken by continuator + * fix BSIM6 parse problem, string macro arg broken by line continuation caused 'unexpected end-of-line' error. * verilogLex.l: * Change string recognition to allow embedded \" as literal quote diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/NEWS new/ADMS-release-2.3.7/NEWS --- old/ADMS-release-2.3.6/NEWS 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/NEWS 2020-08-18 11:28:13.000000000 +0200 @@ -94,6 +94,8 @@ mica: same c code as 1.1.8 03-05-2005: removed admsNS directory release adms-2.0.1 - - - +===== gap ==== +21-11-2016: 2.3.6 +**-08-2020: 2.3.7. minor release. + reproducible build, typo fixes, + include path, instructions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/README.md new/ADMS-release-2.3.7/README.md --- old/ADMS-release-2.3.6/README.md 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/README.md 2020-08-18 11:28:13.000000000 +0200 @@ -39,7 +39,7 @@ - GNU Flex - GNU Bison (tested with 2.5+) - GNU Libtool -- Perl with XML::LibXml (only for maintainers) +- Perl with XML::LibXml - GD modules to manually update documentation images Installing dependencies on Linux Debian/Ubuntu: @@ -58,34 +58,30 @@ #### Compilation Using Autotools -The `--enable-maintainer-mode` makes sure the required files are generated (using Perl and LibXml). +Use the default commands to compile, generate files and install. sh bootstrap.sh - ./configure --enable-maintainer-mode + ./configure make install Autotools it currently used for creating release packages, the `adms-x.x.x.tar.gz` source code archive. sh bootstrap.sh - ./configure --enable-maintainer-mode + ./configure make clean make dist #### Compilation Using CMake -The `-DUSE_MAINTAINER_MODE=ON` makes sure the required files are generated (using Perl and LibXml). - mkdir cmake; cd cmake - cmake .. -DUSE_MAINTAINER_MODE=ON -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=/install/location/ + cmake .. -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=/install/location/ make install Packaging is not yet supported with CMake. At the moment, only static libraries can be build with CMake. - ### Users Install from Tarball This section is relevant in case ADMS is compiled from a source code archive (`adms-x.x.x.tar.gz`). -Users should be able to build without Perl (and the maintainer required modules XML::LibXml and GD). #### Compilation Using Autotools @@ -103,6 +99,19 @@ make install +#### Building an RPM + +Go through all the aclocal/automake/configure process to ensure you have all the dependencies installed. + +Chances are you will need to install these packages: gcc-c++ flex bison libtool libtool-ltdl-devel + +Then rename the ADSM directory to ADSM-2.3.0 and tar it to make ~/rpmbuild/SOURCES/ADMS-2.3.0.tar.gz + +Then copy the spec file into your rpmbuild/SPECS directory + +Then build with rpmbuild -ba SPECS/adms.spec + + ## Credits See AUTHORS file. @@ -189,9 +198,9 @@ 3- run: libtoolize --force --ltdl -c (create libltdl and config.guess, config.sub, ltmain.sh in auxconf) 4- run: automake -a -c (create missing, mkinstalldirs, install-sh in auxconf and all Makefile.in) 5- run: autoconf (create configure) - 6- run: ./configure --enable-maintainer-mode + 6- run: ./configure In three shots: rm -rf auxconf && autoheader && mkdir auxconf && aclocal && libtoolize --force --ltdl -c touch ChangeLog && automake -a -c && autoconf - ./configure --enable-maintainer-mode + ./configure ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/admsXml/CMakeLists.txt new/ADMS-release-2.3.7/admsXml/CMakeLists.txt --- old/ADMS-release-2.3.6/admsXml/CMakeLists.txt 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/admsXml/CMakeLists.txt 2020-08-18 11:28:13.000000000 +0200 @@ -22,81 +22,77 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ) # for admsPreprocessor.h, amdsVeriloga.h INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) # for generated source code -# Maintainer mode runs the Perl scrips that generate source code -if ( USE_MAINTAINER_MODE ) +# Run the Perl scrips to generate source code +# Run mkelements.pl +# Read in `adms.xml` and generete portions of adms and admst +# Generate outputs: +# adms.h +# adms.c +# admstpathYacc.y +# admstpathYacc.h +# admstpath.dtd +MESSAGE(STATUS "Running mkelements.pl code generator") + +EXECUTE_PROCESS( + COMMAND perl ${CMAKE_SOURCE_DIR}/admsXml/mkelements.pl ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + RESULT_VARIABLE element_result ) + +IF(element_result EQUAL 0) + MESSAGE(STATUS "mkelement.pl completed successfully") +ELSE(element_result EQUAL 0) + MESSAGE(FATAL_ERROR "mkelement.pl failed. Exit code: ${element_result}") +ENDIF(element_result EQUAL 0) + + +# Run mkctext.pl +# Wrap source files as C code +# Generate outputs: +# constants.vams.c +# disciplines.vams.c +# adms.implicit.xml.c +# dummy.va.c +# dummy.xml.c +SET(CTEXT + constants.vams + disciplines.vams + adms.implicit.xml + dummy.va + dummy.xml ) - # Run mkelements.pl - # Read in `adms.xml` and generete portions of adms and admst - # Generate outputs: - # adms.h - # adms.c - # admstpathYacc.y - # admstpathYacc.h - # admstpath.dtd - MESSAGE(STATUS "Running mkelements.pl code generator") +FOREACH( inc ${CTEXT} ) + MESSAGE(STATUS "Running mkctext.pl code generator on ${inc}") EXECUTE_PROCESS( - COMMAND perl ${CMAKE_SOURCE_DIR}/admsXml/mkelements.pl ${CMAKE_SOURCE_DIR} + COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/mkctext.pl ${CMAKE_CURRENT_SOURCE_DIR}/${inc} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - RESULT_VARIABLE element_result ) + RESULT_VARIABLE text_result ) - IF(element_result EQUAL 0) - MESSAGE(STATUS "mkelement.pl completed successfully") - ELSE(element_result EQUAL 0) - MESSAGE(FATAL_ERROR "mkelement.pl failed. Exit code: ${element_result}") - ENDIF(element_result EQUAL 0) - - - # Run mkctext.pl - # Wrap source files as C code - # Generate outputs: - # constants.vams.c - # disciplines.vams.c - # adms.implicit.xml.c - # dummy.va.c - # dummy.xml.c - SET(CTEXT - constants.vams - disciplines.vams - adms.implicit.xml - dummy.va - dummy.xml ) - - FOREACH( inc ${CTEXT} ) - MESSAGE(STATUS "Running mkctext.pl code generator on ${inc}") - - EXECUTE_PROCESS( - COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/mkctext.pl ${CMAKE_CURRENT_SOURCE_DIR}/${inc} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - RESULT_VARIABLE text_result ) - - IF(text_result EQUAL 0) - MESSAGE(STATUS "mkctext.pl completed successfully") - ELSE(text_result EQUAL 0) - MESSAGE(FATAL_ERROR "mkctext.pl failed. Exit code: ${text_result}") - ENDIF(text_result EQUAL 0) - ENDFOREACH() - - - # Run mkgrammar.pl - # Process verilogaYacc.y.in and generate the parser - # Generate output: - # verilogaYacc.y - # - MESSAGE(STATUS "Running mkgrammar.pl code generator") - - EXECUTE_PROCESS( - COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/mkgrammar.pl ${CMAKE_CURRENT_SOURCE_DIR}/verilogaYacc.y.in - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - RESULT_VARIABLE grammar_result ) - - IF(grammar_result EQUAL 0) - MESSAGE(STATUS "mkgrammar.pl completed successfully") - ELSE(grammar_result EQUAL 0) - MESSAGE(FATAL_ERROR "mkgrammar.pl failed. Exit code: ${grammar_result}") - ENDIF(grammar_result EQUAL 0) - -ENDIF ( USE_MAINTAINER_MODE ) + IF(text_result EQUAL 0) + MESSAGE(STATUS "mkctext.pl completed successfully") + ELSE(text_result EQUAL 0) + MESSAGE(FATAL_ERROR "mkctext.pl failed. Exit code: ${text_result}") + ENDIF(text_result EQUAL 0) +ENDFOREACH() + + +# Run mkgrammar.pl +# Process verilogaYacc.y.in and generate the parser +# Generate output: +# verilogaYacc.y +# +MESSAGE(STATUS "Running mkgrammar.pl code generator") + +EXECUTE_PROCESS( + COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/mkgrammar.pl ${CMAKE_CURRENT_SOURCE_DIR}/verilogaYacc.y.in + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + RESULT_VARIABLE grammar_result ) + +IF(grammar_result EQUAL 0) + MESSAGE(STATUS "mkgrammar.pl completed successfully") +ELSE(grammar_result EQUAL 0) + MESSAGE(FATAL_ERROR "mkgrammar.pl failed. Exit code: ${grammar_result}") +ENDIF(grammar_result EQUAL 0) # Issue with flex: # BISON_TARGET, FLEX_TARGET and ADD_FLEX_BISON_DEPENDENCY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/admsXml/Makefile.am new/ADMS-release-2.3.7/admsXml/Makefile.am --- old/ADMS-release-2.3.6/admsXml/Makefile.am 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/admsXml/Makefile.am 2020-08-18 11:28:13.000000000 +0200 @@ -10,12 +10,6 @@ # use mkctext.pl to create C files containing the contents of each input file # in a C character array. The output is used by make check only -# Perl XML::LibXml module are only required for maintainer -# Parser created by maintainer -# BUG: these rules are also required when building from git. -# workaround: default to maintainer mode when building from git. -if MAINTAINER_MODE - $(incfilec):%.c:% ${srcdir}/mkctext.pl $(PERL) ${srcdir}/mkctext.pl $< $(top_srcdir) @@ -25,8 +19,6 @@ verilogaYacc.y: ${srcdir}/verilogaYacc.y.in ${srcdir}/mkgrammar.pl $(PERL) ${srcdir}/mkgrammar.pl ${srcdir}/verilogaYacc.y.in -endif - dist_man_MANS = admsXml.1 admsCheck.1 lib_LTLIBRARIES=libadmsElement.la libadmsPreprocessor.la libadmsVeriloga.la libadmsAdmstpath.la @@ -41,7 +33,7 @@ libadmsPreprocessor_la_LDFLAGS=-no-undefined libadmsPreprocessor_la_LIBADD=libadmsElement.la -verilogYacc.h: verilogYacc.c +verilogaYacc.h: verilogaYacc.c libadmsVeriloga_la_SOURCES=verilogaYacc.y verilogaLex.l verilogaYacc.h libadmsVeriloga_la_CPPFLAGS=-DinsideVeriloga libadmsVeriloga_la_LDFLAGS=-no-undefined @@ -58,6 +50,7 @@ admsXml_SOURCES=admsXml.c admsXml_LDADD=-lm libadmsElement.la libadmsVeriloga.la libadmsPreprocessor.la libadmsAdmstpath.la +admsXml_CPPFLAGS=${AM_CPPFLAGS} -DADMS_INCLUDEDIR=\"${pkgincludedir}\" admsXml.c: adms.implicit.xml.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/admsXml/adms.implicit.xml new/ADMS-release-2.3.7/admsXml/adms.implicit.xml --- old/ADMS-release-2.3.6/admsXml/adms.implicit.xml 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/admsXml/adms.implicit.xml 2020-08-18 11:28:13.000000000 +0200 @@ -156,6 +156,9 @@ </admst:otherwise> </admst:choose> </admst:when> + <admst:when test="[name='\$port_connected']"> + <admst:value-to select="dependency" string="constant"/> + </admst:when> <admst:otherwise> <admst:apply-templates select="arguments" match="e:dependency"/> <admst:choose> @@ -191,6 +194,7 @@ name='idt' or name='ddt' or name='\$param_given' or + name='\$port_connected' or name='\$given' or name='ddx' or name='flicker_noise' or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/admsXml/admsXml.c new/ADMS-release-2.3.7/admsXml/admsXml.c --- old/ADMS-release-2.3.6/admsXml/admsXml.c 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/admsXml/admsXml.c 2020-08-18 11:28:13.000000000 +0200 @@ -616,6 +616,9 @@ adms_slist_push(&pproot()->skipp_text,(p_adms)(long)(0)); pproot()->includePath=getlist_from_argv(argc,argv,"-I","directory"); adms_slist_push(&pproot()->includePath,(p_adms)"."); +#ifdef ADMS_INCLUDEDIR + adms_slist_push(&pproot()->includePath,(p_adms)ADMS_INCLUDEDIR); +#endif adms_preprocessor_get_define_from_argv(argc,argv); adms_preprocessor_define_add_default("insideADMS"); adms_message_verbose(("create temporary file %s\n",mytmpverilogamsfile)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/admsXml/constants.vams new/ADMS-release-2.3.7/admsXml/constants.vams --- old/ADMS-release-2.3.6/admsXml/constants.vams 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/admsXml/constants.vams 2020-08-18 11:28:13.000000000 +0200 @@ -46,6 +46,6 @@ `define M_LN10 2.30258509299404568401 `define P_C 299792458 // m / s `define P_H 6.62607004081e-34 //planck constant. in \text{ J???s} -`define P_MU0 1.2566370614e-6 // v. perm. H / m or T??m / A or Wb / (A??m) or V??s / (A??m) +`define P_U0 1.2566370614e-6 // v. perm. H / m or T??m / A or Wb / (A??m) or V??s / (A??m) `endif // CONSTANTS_VAMS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/admsXml/mkelements.pl new/ADMS-release-2.3.7/admsXml/mkelements.pl --- old/ADMS-release-2.3.6/admsXml/mkelements.pl 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/admsXml/mkelements.pl 2020-08-18 11:28:13.000000000 +0200 @@ -1884,7 +1884,7 @@ } push @Location03," ENDIFIDENT\n"; } -foreach(keys(%A)) +foreach(sort keys(%A)) { my($aname,$ee)=($_,$A{$_}); push @Location03," IFIDENT($aname)\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/admsXml/mkgrammar.pl new/ADMS-release-2.3.7/admsXml/mkgrammar.pl --- old/ADMS-release-2.3.6/admsXml/mkgrammar.pl 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/admsXml/mkgrammar.pl 2020-08-18 11:28:13.000000000 +0200 @@ -71,7 +71,7 @@ die "bisonrule should terminate with ';' - see $_" if(not m/^\s+;$/); } } -map {print OFH "\%token <_lexval> $_\n";} keys %Token; +map {print OFH "\%token <_lexval> $_\n";} sort keys %Token; print OFH "\n"; map {print OFH "\%type <_yaccval> $_->{name}\n";} @allbisonrule; print OFH "\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/configure.ac new/ADMS-release-2.3.7/configure.ac --- old/ADMS-release-2.3.6/configure.ac 2016-11-21 21:24:39.000000000 +0100 +++ new/ADMS-release-2.3.7/configure.ac 2020-08-18 11:28:13.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([adms],[2.3.6],[qucs-de...@lists.sourceforge.net]) +AC_INIT([adms],[2.3.7],[qucs-de...@lists.sourceforge.net]) AC_CONFIG_HEADER([config.h]) # specific configuration. @@ -26,16 +26,8 @@ AM_INIT_AUTOMAKE([foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -# Maintainer mode is used to detect/run Perl (XML::LibXml) and make dist tarball -AM_MAINTAINER_MODE - AC_CHECK_PROG(GIT,git,yes) AC_MSG_CHECKING([for git repo]) -AS_IF([test x"$GIT" = "xyes" && test -d $srcdir/.git], - [have_git_repo=yes - AM_MAINTAINER_MODE([enable])], - [have_git_repo=no]) -AC_MSG_RESULT([$have_git_repo]) AX_PROG_FLEX([],[AC_MSG_WARN(Program flex not found (found $LEX)) AC_MSG_ERROR(Please install gnu flex from http://www.gnu.org/software/flex/)]) @@ -97,18 +89,15 @@ AC_PROG_LIBTOOL AC_SUBST([LIBTOOL_DEPS]) -dnl Perl, XML::LibXML module required for maintainer -if test $USE_MAINTAINER_MODE = yes; then - - AC_PATH_PROG(PERL, perl, :) - if test "$PERL" = ":"; then - AC_MSG_ERROR([The $PACKAGE package requires an installed perl.]) - fi; - - 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])]) -fi +dnl Perl, XML::LibXML module required +AC_PATH_PROG(PERL, perl, :) +if test "$PERL" = ":"; then + AC_MSG_ERROR([The $PACKAGE package requires an installed perl.]) +fi; + +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])]) # Define preprocessor flag for static build (MinGW). AS_IF([test "x$enable_shared" = "xno"], [ @@ -131,8 +120,6 @@ Configure Information: Host : $host - Maintainer mode : $USE_MAINTAINER_MODE - C Compiler : $CC DEFS : $DEFS CFLAGS : $CFLAGS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ADMS-release-2.3.6/contrib/adms.spec new/ADMS-release-2.3.7/contrib/adms.spec --- old/ADMS-release-2.3.6/contrib/adms.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/ADMS-release-2.3.7/contrib/adms.spec 2020-08-18 11:28:13.000000000 +0200 @@ -0,0 +1,37 @@ +Name: ADMS +Version: 2.3.0 +Release: 1%{?dist} +Summary: code generator that converts electrical compact device models.. transforms Verilog-AMS code into other target languages +License: GPL +URL: https://github.com/Qucs/ADMS +Source0: ADMS-2.3.0.tar.gz + +#BuildRequires: +#Requires: + +%description + + +%prep +%setup -q + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +%make_install + + +%files +%doc +%{_bindir}/* +/usr/include/adms/* +/usr/lib64/* +/usr/share/man/man1/* + + +%changelog
