RPM Packaging: update packages

pull/3/head
François Andriot 10 years ago
parent 25e81ae17c
commit 790fbeae24

@ -28,7 +28,7 @@ Summary: Raw picture decoding C++ library (runtime) [Trinity]
Epoch: 1
Version: 0.1.9
Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Environment/Libraries

@ -111,6 +111,9 @@ Provides: tdebase = %{version}-%{release}
%if 0%{?suse_version}
# for set_permissions macro
PreReq: permissions
%endif
%if 0%{?opensuse_bs}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
@ -227,7 +230,7 @@ Requires: desktop-common-data
# OpenSuse 11.4 Theme
%if "%{?suse_version}" == "1140"
Requires: hicolor-icon-theme-branding = 11.4
Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
@ -235,7 +238,7 @@ Requires: hicolor-icon-theme-branding = 11.4
%if "%{?suse_version}" == "1220"
Requires: wallpaper-branding
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
Requires: hicolor-icon-theme-branding = 12.2
Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
@ -243,7 +246,7 @@ Requires: hicolor-icon-theme-branding = 12.2
%if "%{?suse_version}" == "1230"
Requires: wallpaper-branding
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
Requires: hicolor-icon-theme-branding = 12.3
Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
@ -251,7 +254,7 @@ Requires: hicolor-icon-theme-branding = 12.3
%if "%{?suse_version}" == "1310"
Requires: wallpaper-branding
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
Requires: hicolor-icon-theme-branding = 13.1
Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
@ -1444,22 +1447,22 @@ needed for a basic TDE desktop installation.
%{tde_datadir}/icons/crystalsvg/*/apps/licq.png
%{tde_datadir}/icons/crystalsvg/*/apps/linuxconf.png
%{tde_datadir}/icons/crystalsvg/*/apps/locale.png
%{tde_datadir}/icons/crystalsvg/*/apps/looknfeel.png
%{tde_datadir}/icons/crystalsvg/*/categories/preferences-desktop.png
%{tde_datadir}/icons/crystalsvg/*/apps/multimedia.png
%{tde_datadir}/icons/crystalsvg/*/apps/netscape.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_applications.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_development.png
%{tde_datadir}/icons/crystalsvg/*/categories/applications-development.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_favourite.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_games.png
%{tde_datadir}/icons/crystalsvg/*/categories/applications-games.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_games_kids.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_multimedia.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_network.png
%{tde_datadir}/icons/crystalsvg/*/categories/applications-multimedia.png
%{tde_datadir}/icons/crystalsvg/*/categories/applications-internet.png
%{tde_datadir}/icons/crystalsvg/*/apps/package.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_settings.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_toys.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_utilities.png
%{tde_datadir}/icons/crystalsvg/*/categories/applications-utilities.png
%{tde_datadir}/icons/crystalsvg/*/apps/penguin.png
%{tde_datadir}/icons/crystalsvg/*/apps/personal.png
%{tde_datadir}/icons/crystalsvg/*/categories/preferences-desktop-personal.png
%{tde_datadir}/icons/crystalsvg/*/apps/phppg.png
%{tde_datadir}/icons/crystalsvg/*/apps/proxy.png
%{tde_datadir}/icons/crystalsvg/*/apps/pysol.png
@ -1549,7 +1552,7 @@ needed for a basic TDE desktop installation.
%{tde_datadir}/icons/crystalsvg/*/apps/edu_languages.png
%{tde_datadir}/icons/crystalsvg/*/apps/edu_mathematics.png
%{tde_datadir}/icons/crystalsvg/*/apps/edu_miscellaneous.png
%{tde_datadir}/icons/crystalsvg/*/apps/edu_science.png
%{tde_datadir}/icons/crystalsvg/*/categories/applications-science.png
%{tde_datadir}/icons/crystalsvg/*/apps/emacs.png
%{tde_datadir}/icons/crystalsvg/*/apps/enhanced_browsing.png
%{tde_datadir}/icons/crystalsvg/*/apps/evolution.png
@ -1565,13 +1568,13 @@ needed for a basic TDE desktop installation.
%{tde_datadir}/icons/crystalsvg/*/apps/icons.png
%{tde_datadir}/icons/crystalsvg/*/apps/iconthemes.png
%{tde_datadir}/icons/crystalsvg/*/apps/ieee1394.png
%{tde_datadir}/icons/crystalsvg/*/apps/input_devices_settings.png
%{tde_datadir}/icons/crystalsvg/*/categories/preferences-desktop-peripherals.png
%{tde_datadir}/icons/crystalsvg/*/apps/kcmkicker.png
%{tde_datadir}/icons/crystalsvg/*/apps/kcmmidi.png
%{tde_datadir}/icons/crystalsvg/*/apps/kcmprocessor.png
%{tde_datadir}/icons/crystalsvg/*/apps/kcmscsi.png
%{tde_datadir}/icons/crystalsvg/*/apps/kcmsound.png
%{tde_datadir}/icons/crystalsvg/*/apps/kcmsystem.png
%{tde_datadir}/icons/crystalsvg/*/categories/preferences-system.png
%{tde_datadir}/icons/crystalsvg/*/apps/kcmx.png
%{tde_datadir}/icons/crystalsvg/*/apps/keyboard.png
%{tde_datadir}/icons/crystalsvg/*/apps/keyboard_layout.png
@ -1590,9 +1593,9 @@ needed for a basic TDE desktop installation.
%{tde_datadir}/icons/crystalsvg/*/apps/package_games_board.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_games_card.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_games_strategy.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_graphics.png
%{tde_datadir}/icons/crystalsvg/*/categories/applications-graphics.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_system.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_wordprocessing.png
%{tde_datadir}/icons/crystalsvg/*/categories/applications-office.png
%{tde_datadir}/icons/crystalsvg/*/apps/pan.png
%{tde_datadir}/icons/crystalsvg/*/apps/panel_settings.png
%{tde_datadir}/icons/crystalsvg/*/apps/plan.png
@ -3660,15 +3663,15 @@ pushd "%{?buildroot}%{tde_datadir}/icons"
for i in {16,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/misc.png hicolor/"$i"x"$i"/apps/kcmcomponentchooser.png ;done
for i in {16,22,32,48,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png hicolor/"$i"x"$i"/apps/kcmperformance.png ;done
for i in 16; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/services.png hicolor/"$i"x"$i"/apps/kcmkded.png ;done
for i in {16,22,32,48}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/exit.png hicolor/"$i"x"$i"/apps/kcmsmserver.png ;done
for i in {16,22,32}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/spellcheck.png hicolor/"$i"x"$i"/apps/kcmspellchecking.png ;done
for i in {16,22,32,48}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/system-log-out.png hicolor/"$i"x"$i"/apps/kcmsmserver.png ;done
for i in {16,22,32}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/tools-check-spelling.png hicolor/"$i"x"$i"/apps/kcmspellchecking.png ;done
for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/desktop.png hicolor/"$i"x"$i"/apps/kcmdesktopbehavior.png ;done
for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/desktop.png hicolor/"$i"x"$i"/apps/kcmdesktop.png ;done
for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kmenu.png hicolor/"$i"x"$i"/apps/kcmtaskbar.png ;done
for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/colorscm.png hicolor/"$i"x"$i"/apps/kcmcolors.png ;done
for i in {16,22,32,48,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png hicolor/"$i"x"$i"/apps/kcmlaunch.png ;done
for i in {16,22,32}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/filter.png hicolor/"$i"x"$i"/apps/kcmkhtml_filter.png ;done
for i in {16,22,32}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/run.png hicolor/"$i"x"$i"/apps/kcmcgi.png ;done
for i in {16,22,32}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/system-run.png hicolor/"$i"x"$i"/apps/kcmcgi.png ;done
for i in {16,22}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/history.png hicolor/"$i"x"$i"/apps/kcmhistory.png ;done
for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png hicolor/"$i"x"$i"/apps/kcmnetpref.png ;done
for i in {16,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png hicolor/"$i"x"$i"/apps/kcmkdnssd.png ;done

@ -1,65 +1,79 @@
# 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
#
# spec file for package tdegraphics (version R14.0.0)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
# 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_epoch 2
%define tde_version 14.0.0
# TDE specific building variables
%define tde_pkg tdegraphics
%define tde_prefix /opt/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_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
# 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
Name: trinity-tdegraphics
Name: trinity-%{tde_pkg}
Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL
Summary: Trinity Desktop Environment - Graphics Applications
Group: Applications/Multimedia
Prefix: %{tde_prefix}
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
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: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
# TDE
## RHEL / Fedora specific patches
# [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5
Patch3: kdegraphics-3.5.13-xpdf_disable_mkstemps.patch
# [tdegraphics] Fix build on RHEL4
Patch201: kdegraphics-3.5.13.1-fix_rhel4_libraries.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: trinity-tdebase-devel >= %{version}
BuildRequires: gettext
BuildRequires: libmng-devel
%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
BuildRequires: %{_lib}png15-devel
%else
BuildRequires: libpng-devel
%endif
BuildRequires: libtiff-devel
BuildRequires: automake libtool
# LIBUSB support
BuildRequires: libusb-devel
# MNG support
BuildRequires: libmng-devel
# TIFF support
BuildRequires: libtiff-devel
# PCRE support
BuildRequires: pcre-devel
# GIF support
@ -102,76 +116,62 @@ BuildRequires: t1lib-devel
%endif
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}sane1-devel
# kuickshow
# IMLIB1 support (kuickshow)
#BuildRequires: %{_lib}imlib-devel
# kpovmodeler
BuildRequires: %{_lib}xi-devel
# kgamma
BuildRequires: %{_lib}xxf86vm-devel
# ksvg
%if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xmu-devel
%else
BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
%endif
# kpovmodeler
BuildRequires: %{_lib}mesagl1-devel
BuildRequires: %{_lib}mesaglu1-devel
%else
BuildRequires: sane-backends-devel
# kuickshow
#BuildRequires: imlib-devel
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%else
BuildRequires: libdrm-devel
# kpovmodeler
%if 0%{?suse_version} == 1140
BuildRequires: libXi6-devel
# SANE support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}sane1-devel
%else
BuildRequires: libXi-devel
BuildRequires: sane-backends-devel
%endif
# kgamma
# LIBXXF86VM support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xxf86vm-devel
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
BuildRequires: libXxf86vm-devel
%endif
# ksvg
# XMU support
%if 0%{?suse_version} == 1140
BuildRequires: xorg-x11-libXmu-devel
%else
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
BuildRequires: libXmu-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
BuildRequires: libxmu-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
%endif
# kpovmodeler
# MESA support
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: mesaglu-devel
%endif
%if 0%{?suse_version}
%if 0%{?suse_version} >= 1220
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%else
BuildRequires: Mesa-devel
%endif
# DRM support
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%else
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
%endif
BuildRequires: libdrm-devel
%endif
#kfile-plugin
# OPENEXR support
BuildRequires: OpenEXR-devel
# kpdf
%if 0%{?suse_version} == 1140
BuildRequires: freetype2-devel
%else
BuildRequires: freetype-devel
%endif
# poppler
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
BuildRequires: poppler-devel >= 0.12
@ -186,17 +186,14 @@ BuildRequires: trinity-poppler-devel >= 0.12
BuildRequires: trinity-poppler-qt3-devel >= 0.12
%endif
# ksvg
BuildRequires: fontconfig-devel
# LCMS support
%if 0%{?suse_version}
BuildRequires: liblcms-devel
%else
BuildRequires: lcms-devel
%endif
BuildRequires: libart_lgpl-devel
# kuickshow
#define build_kuickshow 1
# FRIBIDI support
BuildRequires: fribidi-devel
# kamera
@ -295,9 +292,9 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%{tde_tdelibdir}/tdeio_kamera.so
%{tde_tdeappdir}/kamera.desktop
%{tde_datadir}/icons/crystalsvg/*/actions/camera_test.png
%{tde_datadir}/icons/crystalsvg/*/apps/camera.png
%{tde_datadir}/icons/crystalsvg/*/devices/camera.png
%{tde_datadir}/icons/crystalsvg/*/places/camera.png
%{tde_datadir}/icons/crystalsvg/*/apps/camera-photo.png
%{tde_datadir}/icons/crystalsvg/*/devices/camera-photo.png
%{tde_datadir}/icons/crystalsvg/*/places/camera-photo.png
%{tde_datadir}/services/camera.protocol
%{tde_tdedocdir}/HTML/en/kamera/
%{tde_tdedocdir}/HTML/en/tdeioslave/camera/
@ -1265,18 +1262,11 @@ Requires: trinity-libpoppler-tqt-devel = %{version}-%{release}
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%if 0%{?rhel} && 0%{?rhel} <= 5
%patch3 -p1 -b .mkstemps
%endif
%if 0%{?rhel} == 4
%patch201 -p1 -b .rhel4
%endif
%if 0%{?build_kamera} == 0
%__rm -rf doc/kamera/
%endif
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"

@ -93,6 +93,9 @@ BuildRequires: fdupes
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%if 0%{?opensuse_bs}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif

@ -82,6 +82,9 @@ BuildRequires: fdupes
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%if 0%{?opensuse_bs}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
@ -622,7 +625,7 @@ This package provides data on multimedia applications for kappfinder.
%defattr(-,root,root,-)
%{tde_datadir}/apps/kappfinder/
%{tde_datadir}/desktop-directories/tde-multimedia-music.directory
%{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu
%config %{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu
##########
@ -1230,7 +1233,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
# Warning: GCC visibility causes FTBFS [Bug #1285]
# Warning: GCC visibility causes FTBFS [Bug #1285]
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@ -1247,7 +1250,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--enable-rpath \
--disable-gcc-hidden-visibility \
\
--with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
--with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb" \
\
--with-cdparanoia \
--with-flac \

@ -433,11 +433,11 @@ This package is part of TDE, as a component of the TDE web development module.
%{tde_tdedocdir}/HTML/en/xsldbg/
%{tde_datadir}/icons/hicolor/*/actions/1downarrow.png
%{tde_datadir}/icons/hicolor/*/actions/configure.png
%{tde_datadir}/icons/hicolor/*/actions/exit.png
#%{tde_datadir}/icons/hicolor/*/actions/system-log-out.png
%{tde_datadir}/icons/hicolor/*/actions/hash.png
%{tde_datadir}/icons/hicolor/*/actions/mark.png
%{tde_datadir}/icons/hicolor/*/actions/next.png
%{tde_datadir}/icons/hicolor/*/actions/run.png
#%{tde_datadir}/icons/hicolor/*/actions/system-run.png
%{tde_datadir}/icons/hicolor/*/actions/step.png
%{tde_datadir}/icons/hicolor/*/actions/xsldbg_*.png
%{tde_datadir}/icons/hicolor/*/apps/kxsldbg.png

Loading…
Cancel
Save