summaryrefslogtreecommitdiffstats
path: root/redhat/tdeartwork
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-09-02 23:20:16 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-09-02 23:20:16 +0200
commit657041c692742710cdc266301f5f9c8625637867 (patch)
tree8dd704518c241faecad00b1ad3535c338b6b5bb4 /redhat/tdeartwork
parentffed930935095fac5a3c79dc4a58ffbc51541482 (diff)
downloadtde-packaging-657041c692742710cdc266301f5f9c8625637867.tar.gz
tde-packaging-657041c692742710cdc266301f5f9c8625637867.zip
RPM Packaging: update R14 main packages
Diffstat (limited to 'redhat/tdeartwork')
-rw-r--r--redhat/tdeartwork/tdeartwork-14.0.0.spec36
1 files changed, 19 insertions, 17 deletions
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec
index bf3a6e77f..42e1205ce 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -35,8 +35,6 @@ Url: http://www.trinitydesktop.org/
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Patch1: tdeartwork-14.0.0-fix_update_screensaver_list.patch
-
BuildRequires: cmake >= 2.8
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -187,9 +185,9 @@ This package is part of Trinity, and a component of the TDE artwork module.
%files style
%defattr(-,root,root,-)
%{tde_tdelibdir}/plugins/styles/
-%{tde_tdelibdir}/kstyle_phase_config.la
-%{tde_tdelibdir}/kstyle_phase_config.so
-%{tde_datadir}/apps/kstyle/
+%{tde_tdelibdir}/tdestyle_phase_config.la
+%{tde_tdelibdir}/tdestyle_phase_config.so
+%{tde_datadir}/apps/tdestyle/
##########
@@ -640,6 +638,18 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
%endif
+%if 0%{?fedora} >= 19
+%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop
+%endif
+
%endif
##########
@@ -652,7 +662,6 @@ This package is part of Trinity, and a component of the TDE artwork module.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .screenlist
# http://www.trinitydesktop.org/wiki/bin/view/Developers/HowToBuild
# NOTE: Before building tdeartwork, install any and all xhack screensavers that might be uses, then:
@@ -664,13 +673,6 @@ cd tdescreensaver/kxsconfig/
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
@@ -707,16 +709,16 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install -C build DESTDIR=%{buildroot}
-# Duplicate with trinity-kbabel (from tdesdk)
-%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/16x16/apps/kbabel.png
-%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/32x32/apps/kbabel.png
-
# Should not be here if xscreensaver is disabled
%if 0%{?with_xscreensaver} == 0
%__rm -f %{?buildroot}%{tde_bindir}/xscreensaver-getimage
%__rm -f %{?buildroot}%{tde_bindir}/xscreensaver-getimage-file
%endif
+# Duplicate with trinity-kbabel (from tdesdk)
+%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/16x16/apps/kbabel.png
+%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/32x32/apps/kbabel.png
+
%clean
%__rm -rf %{buildroot}