diff options
| -rw-r--r-- | redhat/Makefile.r14 | 7 | ||||
| -rwxr-xr-x | redhat/build/build_rpm_package.sh | 2 | ||||
| -rw-r--r-- | redhat/dependencies/arts/arts-14.0.0.spec | 10 | ||||
| -rwxr-xr-x | redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec | 1 | ||||
| -rw-r--r-- | redhat/extras/trinity-filesystem/trinity-filesystem.spec | 145 | ||||
| -rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0.spec | 1 |
6 files changed, 153 insertions, 13 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 705f98633..9421c0db9 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -30,7 +30,7 @@ extras: icons-nuvola kdevmon kdissert klamav kompose koverartist kpacman style-i ### Trinity Dependencies -arts: tqtinterface esound cmake +arts: tqtinterface trinity-filesystem esound cmake $(call buildpkg,dependencies/arts) avahi-tqt: tqtinterface @@ -100,7 +100,7 @@ tdegames: tdebase tdemultimedia tdegraphics: tdebase poppler cmake $(call buildpkg,tdegraphics) -tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt +tdelibs: tqt3 tqtinterface trinity-filesystem arts dbus-tqt dbus-1-tqt cmake avahi-tqt $(call buildpkg,tdelibs) tdemultimedia: tdebase akode @@ -685,3 +685,6 @@ kpacman: style-ia-ora: $(call buildpkg,extras/style-ia-ora) + +trinity-filesystem: + $(call buildpkg,extras/trinity-filesystem) diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index b927b8a0f..2eca7cef5 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -66,7 +66,7 @@ rpmbuild -ba \ --define "packager Francois\ Andriot\ <francois.andriot@free.fr>" \ --define "tde_version ${TDE_VERSION}" \ --define "tde_prefix /opt/trinity" \ - --define "preversion ${PREVERSION}" \ + --define "preversion ${PREVERSION:\\\"\\\"}" \ ${ARGS} \ "${TEMPDIR}/${SPECFILE##*/}" RET=$? diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec index 1f7408f49..abf983a50 100644 --- a/redhat/dependencies/arts/arts-14.0.0.spec +++ b/redhat/dependencies/arts/arts-14.0.0.spec @@ -54,6 +54,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt4-devel >= 1:4.2.0 +Requires: trinity-filesystem >= %{tde_version} BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ @@ -138,17 +139,8 @@ playing a wave file with some effects. %files %defattr(-,root,root,-) %doc COPYING.LIB -%dir %{tde_prefix} -%dir %{tde_bindir} -%dir %{tde_datadir} -%dir %{tde_datadir}/config -%dir %{tde_datadir}/doc -%dir %{tde_libdir} %dir %{tde_libdir}/mcop %dir %{tde_libdir}/mcop/Arts -%dir %{tde_libdir}/pkgconfig -%dir %{tde_includedir} -%dir %{tde_tdeincludedir} %{tde_libdir}/mcop/Arts/* %{tde_libdir}/mcop/*.mcopclass %{tde_libdir}/mcop/*.mcoptype diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec index d3564904b..d1e78eac3 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -97,7 +97,6 @@ Provides: libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libtqt3-mt >= 3.5.0 -Requires: libtqt3-mt >= 3.5.0 %if 0%{?suse_version} && 0%{?suse_version} < 1300 Requires: trinity-cmake-macros %endif diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec new file mode 100644 index 000000000..082f68c61 --- /dev/null +++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec @@ -0,0 +1,145 @@ +# +# spec file for package trinity-filesystem +# +# Copyright (c) 2014 François Andriot <francois.andriot@free.fr> +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# + +# TDE variables +%define tde_version 14.0.0 +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define _docdir %{tde_docdir} +%define tde_docdir %{tde_datadir}/doc +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_includedir %{tde_prefix}/include +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_tdelibdir %{tde_libdir}/trinity + + + +Name: trinity-filesystem +Version: %{tde_version} +Release: 1%{?dist} +Summary: Trinity Directory Layout +Group: System/Fhs +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: /usr +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + + +%description +This package installs the Trinity directory structure. + + +%files +%dir %{tde_prefix} + +%dir %{tde_bindir} + +%dir %{tde_datadir} +%dir %{tde_datadir}/config + +%dir %{tde_docdir} +%dir %{tde_tdedocdir} +%dir %{tde_tdedocdir}/HTML +%dir %{tde_tdedocdir}/HTML/en +%dir %{tde_tdedocdir}/HTML/en/common + +%dir %{tde_includedir} +%dir %{tde_tdeincludedir} + +%dir %{tde_libdir} +%dir %{tde_libdir}/pkgconfig +%dir %{tde_tdelibdir} + +%dir %{tde_datadir}/applications +%dir %{tde_datadir}/applications/tde +%dir %{tde_datadir}/applnk +%dir %{tde_datadir}/apps +%dir %{tde_datadir}/config.kcfg +%dir %{tde_datadir}/autostart +%dir %{tde_datadir}/emoticons +%dir %{tde_datadir}/icons +%dir %{tde_datadir}/icons/crystalsvg +%dir %{tde_datadir}/icons/hicolor +%dir %{tde_datadir}/locale +%dir %{tde_datadir}/mimelnk +%dir %{tde_datadir}/services +%dir %{tde_datadir}/servicetypes + +%dir %{_sysconfdir}/trinity + +########## + +%prep + +%build + +%install +%__install -d -m 755 %{?buildroot}%{tde_prefix} + +%__install -d -m 755 %{?buildroot}%{tde_bindir} + +%__install -d -m 755 %{?buildroot}%{tde_datadir} +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applications +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applications/tde +%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk +%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps +%__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart +%__install -d -m 755 %{?buildroot}%{tde_datadir}/config +%__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg +%__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons +%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons +%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons/crystalsvg +%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons/hicolor +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk +%__install -d -m 755 %{?buildroot}%{tde_datadir}/services +%__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes + +%__install -d -m 755 %{?buildroot}%{tde_docdir} +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir} +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en/common + +%__install -d -m 755 %{?buildroot}%{tde_includedir} +%__install -d -m 755 %{?buildroot}%{tde_tdeincludedir} + +%__install -d -m 755 %{?buildroot}%{tde_libdir} +%__install -d -m 755 %{?buildroot}%{tde_libdir}/pkgconfig +%__install -d -m 755 %{?buildroot}%{tde_tdelibdir} + +%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor +%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32 +%__install -d -m 755 %{?buildroot}%{_datadir}/icons/hicolor/32x32/apps + +%__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity + +%changelog +* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 +- Initial build for TDE R14 diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index 14cd5bf06..f8ddf2030 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -74,6 +74,7 @@ BuildRequires: libdbus-tqt-1-devel >= 2:0.63 BuildRequires: libdbus-1-tqt-devel >= 2:0.9 Requires: trinity-arts >= 2:1.5.10 +Requires: trinity-filesystem >= %{tde_version} BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ |