summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kwin-style-crystal
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/kwin-style-crystal')
-rw-r--r--redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec40
-rw-r--r--redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec64
2 files changed, 59 insertions, 45 deletions
diff --git a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec
index feb901d13..624249bf0 100644
--- a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec
+++ b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.12.spec
@@ -6,14 +6,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{tde_prefix}/share/doc
%endif
# TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
+%define tde_includedir %{tde_includedir}/kde
+%define tde_libdir %{tde_libdir}/kde3
Name: trinity-%{kdecomp}
@@ -28,14 +28,14 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.12.tar.gz
BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -56,7 +56,7 @@ And it is of course nice to look at. Upstream says:
# 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,%{_includedir}/tqt,g"
+ -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@@ -65,18 +65,18 @@ sed -i admin/acinclude.m4.in \
%build
unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--disable-rpath \
- --with-extra-includes=%{_includedir}/tqt
+ --with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
@@ -86,22 +86,22 @@ export PATH="%{_bindir}:${PATH}"
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
-%{tde_libdir}/kwin3_crystal.la
-%{tde_libdir}/kwin3_crystal.so
-%{tde_libdir}/kwin_crystal_config.la
-%{tde_libdir}/kwin_crystal_config.so
-%{_datadir}/apps/kwin/crystal.desktop
+%{tde_tdelibdir}/kwin3_crystal.la
+%{tde_tdelibdir}/kwin3_crystal.so
+%{tde_tdelibdir}/kwin_crystal_config.la
+%{tde_tdelibdir}/kwin_crystal_config.so
+%{tde_datadir}/apps/kwin/crystal.desktop
%Changelog
diff --git a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec
index fdfe31fbc..0febc8eb1 100644
--- a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec
+++ b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal-3.5.13.spec
@@ -1,25 +1,32 @@
# Default version for this component
%define kdecomp kwin-style-crystal
-%define version 1.0.5
-%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{_datadir}/doc
%endif
# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_tdedocdir}
Name: trinity-%{kdecomp}
Summary: Semi transparant window decoration for Trinity.
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
+Version: 1.0.5
+Release: 1%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -28,14 +35,14 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -56,8 +63,8 @@ And it is of course nice to look at. Upstream says:
# 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|%{_includedir}/tqt|g" \
- -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__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"
@@ -66,18 +73,25 @@ And it is of course nice to look at. Upstream says:
%build
unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --disable-rpath \
- --with-extra-includes=%{_includedir}/tqt
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --datadir=%{tde_datadir} \
+ --libdir=%{tde_libdir} \
+ --mandir=%{tde_mandir} \
+ --includedir=%{tde_includedir} \
+ --disable-rpath \
+ --with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
@@ -90,11 +104,11 @@ export PATH="%{_bindir}:${PATH}"
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
-%{tde_libdir}/kwin3_crystal.la
-%{tde_libdir}/kwin3_crystal.so
-%{tde_libdir}/kwin_crystal_config.la
-%{tde_libdir}/kwin_crystal_config.so
-%{_datadir}/apps/kwin/crystal.desktop
+%{tde_tdelibdir}/kwin3_crystal.la
+%{tde_tdelibdir}/kwin3_crystal.so
+%{tde_tdelibdir}/kwin_crystal_config.la
+%{tde_tdelibdir}/kwin_crystal_config.so
+%{tde_datadir}/apps/kwin/crystal.desktop
%Changelog