summaryrefslogtreecommitdiffstats
path: root/redhat/applications/piklab
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-08-17 23:16:27 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-08-17 23:16:27 +0200
commit3981ced036cda6b6a52203f600990c360571d1f5 (patch)
tree573b36b17eb54ce4e9178a41b3df12dce56bed34 /redhat/applications/piklab
parent9e497b5b5e1f50f9d3b6df85008b1b2a9aeb45f6 (diff)
downloadtde-packaging-3981ced036cda6b6a52203f600990c360571d1f5.tar.gz
tde-packaging-3981ced036cda6b6a52203f600990c360571d1f5.zip
RPM Packaging: update packages for 3.5.13.2 under Fedora 19
Diffstat (limited to 'redhat/applications/piklab')
-rw-r--r--redhat/applications/piklab/piklab-3.5.13.2.spec64
1 files changed, 34 insertions, 30 deletions
diff --git a/redhat/applications/piklab/piklab-3.5.13.2.spec b/redhat/applications/piklab/piklab-3.5.13.2.spec
index 6e1ad5c29..b8866b682 100644
--- a/redhat/applications/piklab/piklab-3.5.13.2.spec
+++ b/redhat/applications/piklab/piklab-3.5.13.2.spec
@@ -1,12 +1,13 @@
# Default version for this component
-%define tdecomp piklab
+%define tde_pkg piklab
+%define tde_version 3.5.13.2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@@ -23,29 +24,30 @@
%define _docdir %{tde_tdedocdir}
-Name: trinity-%{tdecomp}
-Summary: IDE for PIC-microcontroller development [Trinity]
-Version: 0.15.2
-Release: 5%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Summary: IDE for PIC-microcontroller development [Trinity]
+Version: 0.15.2
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
-License: GPLv2+
-Group: Applications/Utilities
+License: GPLv2+
+Group: Applications/Utilities
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-3.5.13.2.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires: trinity-tdebase-devel >= 3.5.13.2
+BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: gettext
+BuildRequires: gettext
BuildRequires: readline-devel
%description
@@ -64,13 +66,7 @@ are supported. A command-line programmer and debugger are also available.
%prep
-%setup -q -n %{name}-3.5.13.2
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
- -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
- -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -80,8 +76,8 @@ are supported. A command-line programmer and debugger are also available.
%build
unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -90,8 +86,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --disable-final \
+ --enable-new-ldflags \
+ --enable-closure \
+ --enable-rpath
%__make %{?_smp_mflags}
@@ -104,7 +105,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Incorrect extension on manpage
%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1
-%find_lang %{tdecomp}
+%find_lang %{tde_pkg}
%clean
%__rm -rf %{buildroot}
@@ -121,7 +122,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-%files -f %{tdecomp}.lang
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_bindir}/piklab
%{tde_bindir}/piklab-coff
@@ -143,6 +144,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
+* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.15.2-6
+- Build for Fedora 19
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.15.2-5
- Initial release for TDE 3.5.13.2