[tideEditor] 1.4.2 License change: GPLv2+ -> GPLv3+
Mamoru Tasaka
mtasaka at fedoraproject.org
Tue Sep 13 23:13:16 UTC 2011
commit a5accab4d916bdd514125ff7c33aef5dbd0ff356
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Wed Sep 14 08:13:01 2011 +0900
1.4.2
License change: GPLv2+ -> GPLv3+
.gitignore | 1 +
sources | 2 +-
tideEditor.spec | 38 ++++++++++++++++++++++++++------------
3 files changed, 28 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a2b3fda..0c9ca1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
tideEditor-1.4.1.tar.bz2
+/tideEditor-1.4.2.tar.bz2
diff --git a/sources b/sources
index bd12a68..6fed177 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e8e00579ef5db8828e6929fd6b6ae349 tideEditor-1.4.1.tar.bz2
+540cd6b405d621453a7b85c6a734c095 tideEditor-1.4.2.tar.bz2
diff --git a/tideEditor.spec b/tideEditor.spec
index 4e1517f..e1f49d2 100644
--- a/tideEditor.spec
+++ b/tideEditor.spec
@@ -1,16 +1,17 @@
Name: tideEditor
-Version: 1.4.1
-Release: 6%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
Summary: Editor for Tide Constituent Database (TCD) files
Group: Applications/Engineering
-License: GPLv2+
+License: GPLv3+
URL: http://www.flaterco.com/xtide/
Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: qt%( if [ 0%{?fedora} -gt 8 ] ; then echo -n 3 ; fi )-devel
+BuildRequires: qt4-devel
BuildRequires: libtcd-devel
+# Temporally
+BuildRequires: automake
Requires: xtide-common
%description
@@ -19,18 +20,27 @@ was written by Jan C. Depner but is now jointly maintained by David
Flater and Jan Depner.
%prep
-%setup -q
+%setup -q -n tideeditor-%{version}
+## ???
+sed -i.DSO -e 's|g_free|main|' configure.ac
+autoreconf
%build
+export CPPFLAGS="$RPM_OPT_FLAGS"
+for mod in \
+ QtCore \
+ QtGui \
+ Qt3Support
+do
+ export CPPFLAGS="${CPPFLAGS} $(pkg-config --cflags $mod)"
+done
+export ac_cv_path_MOC=%{_bindir}/moc-qt4
+
%configure
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
%install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
@@ -38,6 +48,10 @@ Flater and Jan Depner.
%{_bindir}/tideEditor
%changelog
+* Tue Sep 13 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.4.2-1
+- 1.4.2
+- License change: GPLv2+ -> GPLv3+
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list