diff --git a/.gitignore b/.gitignore index da51661..3f678c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -qucs-0.0.15.tar.gz -/qucs-0.0.15.tar.gz -/qucs-0.0.16.tar.gz -/qucs-0.0.17.tar.gz -/qucs-0.0.18.tar.gz -/qucs-0.0.19.tar.gz +/qucs-*.tar.gz diff --git a/qucs-0.0.19-compile-fix.patch b/qucs-0.0.19-compile-fix.patch deleted file mode 100644 index 45986da..0000000 --- a/qucs-0.0.19-compile-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/qucs-core/src/Makefile.am b/qucs-core/src/Makefile.am -index fa7b8dd..45f4353 100755 ---- a/qucs-core/src/Makefile.am -+++ b/qucs-core/src/Makefile.am -@@ -122,7 +122,7 @@ all-am: qucsdefs.h - generated_FILES = qucsdefs.h - - qucsdefs.h: qucsator$(EXEEXT) -- ./$< -l > $@ -+ LD_PRELOAD=./.libs/libqucs.so.0 ./$< -l > $@ - - ## The qucs equation definitions use a hash lookup table - ## generated using gperf and put in gperfapphash.cpp which -diff --git a/qucs-core/src/Makefile.in b/qucs-core/src/Makefile.in -index 3196e0d..bb0bfcd 100644 ---- a/qucs-core/src/Makefile.in -+++ b/qucs-core/src/Makefile.in -@@ -1224,7 +1224,7 @@ scan_zvr.cpp: LEX_OUTPUT_ROOT = lex.zvr_ - all-am: qucsdefs.h - - qucsdefs.h: qucsator$(EXEEXT) -- ./$< -l > $@ -+ LD_PRELOAD=./.libs/libqucs.so.0 ./$< -l > $@ - - equation.cpp: gperfapphash.cpp - diff --git a/qucs-0.0.19-latex-fix.patch b/qucs-0.0.19-latex-fix.patch deleted file mode 100644 index 455a3aa..0000000 --- a/qucs-0.0.19-latex-fix.patch +++ /dev/null @@ -1,65 +0,0 @@ -From f8a2e185525fdff7b0cbec39599f039043d5e6f7 Mon Sep 17 00:00:00 2001 -From: Felix Salfelder -Date: Mon, 31 Aug 2020 12:45:07 +0100 -Subject: [PATCH] doc: [latin1]{inputenc} - -fixes issues with non-utf8 charcters ---- - qucs-doc/technical/coplanar.tex | 2 +- - qucs-doc/tutorial/getstarted/getstarted.tex | 2 ++ - qucs-doc/tutorial/modelbjt/modelbjt.tex | 2 ++ - qucs-doc/tutorial/workbook.tex | 2 ++ - 4 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/qucs-doc/technical/coplanar.tex b/qucs-doc/technical/coplanar.tex -index 906e9875d9..b3ec63d8e4 100644 ---- a/qucs-doc/technical/coplanar.tex -+++ b/qucs-doc/technical/coplanar.tex -@@ -75,7 +75,7 @@ \subsection{Quasi-static analysis by conformal mappings} - into a parallel plate capacitor filled with dielectric $ABCD$ using - the conformal function: - \begin{equation} --w = \int_{z_0}^{z}�\dfrac{dz}{\sqrt{(z-W/2)(z-W/2-s)}}. -+w = \int_{z_0}^{z}\dfrac{dz}{\sqrt{(z-W/2)(z-W/2-s)}}. - \end{equation} - - \begin{figure}[ht] -diff --git a/qucs-doc/tutorial/getstarted/getstarted.tex b/qucs-doc/tutorial/getstarted/getstarted.tex -index 41792cc9ef..61b1fed12d 100644 ---- a/qucs-doc/tutorial/getstarted/getstarted.tex -+++ b/qucs-doc/tutorial/getstarted/getstarted.tex -@@ -10,6 +10,8 @@ - - \documentclass[12pt,a4paper,oneside]{report} - -+\usepackage[latin1]{inputenc} -+ - % Include basic and title page definitions. - \include{basics} - \include{titlepage} -diff --git a/qucs-doc/tutorial/modelbjt/modelbjt.tex b/qucs-doc/tutorial/modelbjt/modelbjt.tex -index 680ed3d9a1..2940ec85f9 100644 ---- a/qucs-doc/tutorial/modelbjt/modelbjt.tex -+++ b/qucs-doc/tutorial/modelbjt/modelbjt.tex -@@ -10,6 +10,8 @@ - - \documentclass[12pt,a4paper,oneside]{report} - -+\usepackage[latin1]{inputenc} -+ - % Include basic and title page definitions. - \include{basics} - \include{titlepage} -diff --git a/qucs-doc/tutorial/workbook.tex b/qucs-doc/tutorial/workbook.tex -index d6a08ccf13..7e941da397 100644 ---- a/qucs-doc/tutorial/workbook.tex -+++ b/qucs-doc/tutorial/workbook.tex -@@ -10,6 +10,8 @@ - - \documentclass[headsepline,a4paper,twoside,12pt]{scrreprt} - -+\usepackage[latin1]{inputenc} -+ - % Include basic and title page definitions. - \include{basics} - \include{titlepage} diff --git a/qucs.spec b/qucs.spec index 4c40955..ea6cb84 100644 --- a/qucs.spec +++ b/qucs.spec @@ -3,19 +3,19 @@ Summary: Circuit simulator Name: qucs -Version: 0.0.19 -Release: 6%{?dist} +Version: 0.0.20~rc2 +Release: 1%{?dist} License: GPL+ URL: http://qucs.sourceforge.net/ - -Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/Qucs/%{name}/archive/%{name}-%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz # Desktop file categories must terminate with a semicolon, bug #1424234 Patch0: qucs-0.0.19-fix-desktop-file.patch -Patch1: qucs-0.0.19-compile-fix.patch -Patch2: qucs-0.0.19-latex-fix.patch BuildRequires: make +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: coreutils BuildRequires: desktop-file-utils @@ -70,20 +70,17 @@ Qucs circuit simulator development headers %prep -%setup -q +%autosetup -n %{name}-%{name}-%{version_no_tilde} -p1 # fix file modes chmod 644 qucs/{AUTHORS,COPYING,ChangeLog,NEWS,README,THANKS,TODO} -%patch0 -p1 -b .fix-desktop-file -%patch1 -p1 -b .compile-fix -%patch2 -p1 -b .latex-fix - %build export CFLAGS="%{optflags}" export CXXFLAGS="$CFLAGS" +autoreconf -fi # latex docs seems broken, disable for now %configure --disable-dependency-tracking --enable-debug=yes --disable-doc @@ -122,22 +119,25 @@ rm -f %{buildroot}%{_libdir}/libqucs.la %{_bindir}/qucs* %{_bindir}/ps2sp* %{_datadir}/%{name} -%{_datadir}/qucs-core +%{_datadir}/qucsator %{_datadir}/applications/* %{_mandir}/man1/* %{_datadir}/icons/*/*/* %files lib -%{_libdir}/libqucs.so.* +%{_libdir}/libqucsator.so.* %files devel %{_includedir}/* -%{_libdir}/libqucs.so +%{_libdir}/libqucsator.so %changelog +* Tue Jul 12 2022 Jaroslav Škarvada - 0.0.20~rc2-1 +- New version + * Fri Jan 21 2022 Fedora Release Engineering - 0.0.19-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 3dccef2..3b17f13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qucs-0.0.19.tar.gz) = 0ce68bc84a14ba0515bee4acb3f6e77f9637de817e3a75cba20ca88f093d0e06b9ad229df09e7d0953ceb5b0902dc4dd902a6b5bf7fee1e4a056b55fc7bb3867 +SHA512 (qucs-0.0.20-rc2.tar.gz) = ebe2b8e2d61cf39f8a7496e7464aec98b71a41c7c754c26dc8dd270374074e3e153de7215a8204c9c423b828410eafd323e6dd65edba8acf2f63a8d0a5af8ab5