[qucs/f15] update to 0.0.16
Eric Tanguy
tanguy at fedoraproject.org
Sun Jul 3 18:32:14 UTC 2011
commit f492fc3f91d109c5d1931984722066758338ea78
Author: Eric Tanguy <tanguy-e at bureau.home>
Date: Sun Jul 3 20:15:33 2011 +0200
update to 0.0.16
.gitignore | 1 +
qucs-disable-tr1.patch | 11 +++++++++++
qucs.spec | 28 ++++++++++++----------------
sources | 2 +-
4 files changed, 25 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6f766c6..f10c2c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
qucs-0.0.15.tar.gz
/qucs-0.0.15.tar.gz
+/qucs-0.0.16.tar.gz
diff --git a/qucs-disable-tr1.patch b/qucs-disable-tr1.patch
new file mode 100644
index 0000000..40f22ca
--- /dev/null
+++ b/qucs-disable-tr1.patch
@@ -0,0 +1,11 @@
+--- qucs-core/configure.orig 2011-07-03 07:34:09.069218113 -0500
++++ qucs-core/configure 2011-07-03 07:34:46.618990497 -0500
+@@ -5884,7 +5884,6 @@
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-#include <tr1/complex>
+ using namespace std;
+ using namespace std::tr1;
+ int
+
diff --git a/qucs.spec b/qucs.spec
index 26f348a..97b56a4 100644
--- a/qucs.spec
+++ b/qucs.spec
@@ -1,9 +1,11 @@
Summary: Circuit simulator
Name: qucs
-Version: 0.0.15
-Release: 6%{?dist}
-Source0: http://dowanloads.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
+Version: 0.0.16
+Release: 1%{?dist}
+Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
+# Using the tr1 complex feature breaks building
+Patch0: qucs-disable-tr1.patch
URL: http://qucs.sourceforge.net/
License: GPL+
Group: Applications/Engineering
@@ -20,6 +22,7 @@ e.g. DC, AC, S-parameter and harmonic balance analysis.
%prep
%setup -q
+%patch0 -p0 -b .disable-tr1
%build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -30,22 +33,17 @@ make %{?_smp_mflags}
# that the builder has root privileges
%install
rm -rf $RPM_BUILD_ROOT
-make INSTALL="%{_bindir}/install -p" install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category X-Fedora \
%{SOURCE1}
-
-# support of ADMS
-mkdir %{buildroot}%{_datadir}/%{name}/adms
-cp -p ./qucs-core/src/components/verilog/*.xml %{buildroot}%{_datadir}/%{name}/adms
-
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/qucs*
@@ -55,11 +53,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/*
%changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.15-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sat Aug 21 2010 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.0.15-5
-- Patch no longer needed with freehdl-0.0.7
+* Sun Jul 03 2011 Bruno Wolff III <bruno at wolff.to> - 0.0.16-1
+- Update to upstream 0.0.16
+- Fix FTBFS - bug 631404
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.15-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -123,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT
* Mon Jan 23 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.8-1
- Update to 0.0.8
- Add -ffriend-injection to $RPM_OPT_FLAGS for building against gcc-4.1
-
+
* Fri Nov 4 2005 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.7-8
- Modify ctaegories in qucs.desktop
diff --git a/sources b/sources
index c9da893..d24fed0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a35eee790c92eba97de181b12794823 qucs-0.0.15.tar.gz
+c916502171d422ab168fe5fc681b29d8 qucs-0.0.16.tar.gz
More information about the scm-commits
mailing list