RHEL/Fedora: lots of updates

pull/3/head
Francois Andriot 13 years ago
parent 4647c085f8
commit d932781559

@ -1,16 +1,16 @@
# Default version for this component # Default version for this component
%define kdecomp digikam %define kdecomp digikam
%define version 0.9.6
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_prefix}/share/doc %define _docdir %{_datadir}/doc
%define _mandir %{_datadir}/man
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
%define tde_appdir %{_datadir}/applications/kde
%define tde_docdir %{_docdir}/kde %define tde_docdir %{_docdir}/kde
%define tde_includedir %{_includedir}/kde %define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/trinity %define tde_libdir %{_libdir}/trinity
@ -18,8 +18,8 @@ BuildRequires: autoconf automake libtool m4
Name: trinity-%{kdecomp} Name: trinity-%{kdecomp}
Summary: digital photo management application for KDE [Trinity] Summary: digital photo management application for KDE [Trinity]
Version: %{?version} Version: 0.9.6
Release: %{?release}%{?dist}%{?_variant} Release: 2%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities Group: Applications/Utilities
@ -60,6 +60,7 @@ BuildRequires: libgphoto2-devel
%endif %endif
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: jasper-devel BuildRequires: jasper-devel
BuildRequires: exiv2-devel
%description %description
@ -68,18 +69,18 @@ application, which makes importing, organizing and manipulating
digital photos a "snap". An interface is provided to connect to digital photos a "snap". An interface is provided to connect to
your digital camera, preview the images and download and/or your digital camera, preview the images and download and/or
delete them. delete them.
.
The digiKam built-in image editor makes the common photo correction The digiKam built-in image editor makes the common photo correction
a simple task. The image editor is extensible via plugins and, a simple task. The image editor is extensible via plugins and,
the digikamimageplugins project has been merged to digiKam core the digikamimageplugins project has been merged to digiKam core
since release 0.9.2, all useful image editor plugins are available since release 0.9.2, all useful image editor plugins are available
in the base installation. in the base installation.
.
digiKam can also make use of the KIPI image handling plugins to digiKam can also make use of the KIPI image handling plugins to
extend its capabilities even further for photo manipulations, extend its capabilities even further for photo manipulations,
import and export, etc. The kipi-plugins package contains many import and export, etc. The kipi-plugins package contains many
very useful extentions. very useful extentions.
.
digiKam is based in part on the work of the Independent JPEG Group. digiKam is based in part on the work of the Independent JPEG Group.
@ -140,10 +141,18 @@ export PATH="%{_bindir}:${PATH}"
%post %post
touch --no-create %{_datadir}/icons/hicolor || : touch --no-create %{_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
/sbin/ldconfig
%postun %postun
touch --no-create %{_datadir}/icons/hicolor || : touch --no-create %{_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
/sbin/ldconfig
%post devel
/sbin/ldconfig
%postun devel
/sbin/ldconfig
%files %files
@ -151,7 +160,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%doc AUTHORS COPYING %doc AUTHORS COPYING
%{_bindir}/* %{_bindir}/*
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_datadir}/applications/*/*.desktop %{tde_appdir}/*.desktop
%{_datadir}/locale/*/LC_MESSAGES/digikam.mo %{_datadir}/locale/*/LC_MESSAGES/digikam.mo
%{_datadir}/services/*.desktop %{_datadir}/services/*.desktop
%{_datadir}/services/*.protocol %{_datadir}/services/*.protocol
@ -160,18 +169,24 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{tde_docdir}/HTML/en/*/ %{tde_docdir}/HTML/en/*/
%{_datadir}/icons/hicolor/*/*/* %{_datadir}/icons/hicolor/*/*/*
%{_mandir}/man*/* %{_mandir}/man*/*
%{tde_libdir}/*.so
%{tde_libdir}/*.la
%files devel %files devel
%{_includedir}/*.h %{_includedir}/*.h
%{_includedir}/digikam %{_includedir}/digikam/
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/*.la %{_libdir}/*.la
%{_libdir}/*/*.so
%{_libdir}/*/*.la
%Changelog %Changelog
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
- Fix man directory location
- Fix postinstall
- Fix description
- Add "BuildRequires: exiv2-devel"
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-2 * Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-2
- gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958] - gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958]

@ -1,12 +1,10 @@
# Default version for this component # Default version for this component
%define kdecomp dolphin %define kdecomp dolphin
%define version 0.9.2
%define release 4
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_prefix}/share/doc %define _docdir %{_datadir}/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
@ -18,8 +16,8 @@ BuildRequires: autoconf automake libtool m4
Name: trinity-%{kdecomp} Name: trinity-%{kdecomp}
Summary: File manager for TDE focusing on usability Summary: File manager for TDE focusing on usability
Version: %{?version} Version: 0.9.2
Release: %{?release}%{?dist}%{?_variant} Release: 5%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities Group: Applications/Utilities
@ -104,6 +102,9 @@ for lang_dir in %{buildroot}$HTML_DIR/* ; do
done done
fi fi
# Makes 'media_safelyremove.desktop' an alternative
%__mv -f %{buildroot}%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
%__ln_s /etc/alternatives/media_safelyremove.desktop_d3lphin %{buildroot}%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
@ -112,10 +113,21 @@ fi
%post %post
touch --no-create %{_datadir}/icons/hicolor || : touch --no-create %{_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
alternatives --install \
%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop \
media_safelyremove.desktop_d3lphin \
%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin \
10
%postun %postun
touch --no-create %{_datadir}/icons/hicolor || : touch --no-create %{_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
if [ $1 -eq 0 ]; then
alternatives --remove \
media_safelyremove.desktop_d3lphin \
%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
fi
%files %files
@ -125,12 +137,14 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/apps/*/ %{_datadir}/apps/*/
%doc %lang(en) %{tde_docdir}/HTML/en/*/ %doc %lang(en) %{tde_docdir}/HTML/en/*/
%{_datadir}/icons/hicolor/128x128/apps/*.png %{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/??x??/apps/*.png
%{_datadir}/locale/*/*/d3lphin.mo %{_datadir}/locale/*/*/d3lphin.mo
%Changelog %Changelog
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-5
- Add alternatives with 'kio-umountwrapper'
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-4 * Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-4
- Rebuild for Fedora 17 - Rebuild for Fedora 17
- Fix HTML installation directory - Fix HTML installation directory

@ -18,7 +18,7 @@ BuildRequires: autoconf automake libtool m4
Name: trinity-systemsettings Name: trinity-systemsettings
Summary: easy to use control centre for TDE Summary: easy to use control centre for TDE
Version: 0.0svn20070312 Version: 0.0svn20070312
Release: 2%{?dist}%{?_variant} Release: 3%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities Group: Applications/Utilities
@ -33,12 +33,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz Source0: %{kdecomp}-3.5.13.tar.gz
Source1: kde-settings-laptops.directory Source1: kde-settings-laptops.directory
Provides: trinity-kde-systemsettings = %{version}-%{release}
Obsoletes: trinity-kde-systemsettings < %{version}-%{release}
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-tdelibs-devel
BuildRequires: trinity-kdebase-devel BuildRequires: trinity-tdebase-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
Requires: trinity-kde-guidance Requires: trinity-guidance
%description %description
System preferences is a replacement for the TDE System preferences is a replacement for the TDE
@ -96,7 +99,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README TODO %doc README TODO
%{_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu %{_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu
%{_sysconfdir}/xdg/menus/system-settings.menu %exclude %{_sysconfdir}/xdg/menus/system-settings.menu
%{_bindir}/systemsettings %{_bindir}/systemsettings
%{_datadir}/applications/kde/audioencoding.desktop %{_datadir}/applications/kde/audioencoding.desktop
%{_datadir}/applications/kde/defaultapplication.desktop %{_datadir}/applications/kde/defaultapplication.desktop
@ -115,6 +118,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
%Changelog %Changelog
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-3
- Updates 'Requires: trinity-guidance' to reflect package renaming
* Wed Dec 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-2 * Wed Dec 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-2
- Fix XDG menu directory location - Fix XDG menu directory location

@ -0,0 +1,74 @@
[Desktop Entry]
ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/camera_mounted,media/camera_unmounted
Actions=MediaSafelyRemove;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true
[Desktop Action MediaSafelyRemove]
Name=Safely Remove
Name[af]=Verwyder veilig
Name[ar]=أحذف بأمان
Name[be]=Бяспечна адлучыць
Name[bg]=Безопасно изваждане
Name[bn]=নিরাপদভাবে সরাও
Name[bs]=Sigurno ukloni
Name[ca]=Extreu amb seguretat
Name[cs]=Bezpečně odstranit
Name[csb]=Remôj na bezpieczny ôrt
Name[da]=Fjern sikkert
Name[de]=Sicher entfernen
Name[el]=Ασφαλής αφαίρεση
Name[eo]=Sekura Forigo
Name[es]=Extracción segura
Name[et]=Eemalda turvaliselt
Name[eu]=Atera arriskurik gabe
Name[fa]=حذف امن
Name[fi]=Poista turvallisesti
Name[fr]=Enlever en toute sécurité
Name[fy]=Feilich ferwiderje
Name[ga]=Bain Amach go Sábháilte
Name[gl]=Eliminar de Maneira Segura
Name[he]=שליפה בבטחה
Name[hr]=Slobodno uklonite
Name[hu]=Biztonságos leválasztás
Name[is]=Fjarlægja öruggt
Name[it]=Rimozione sicura
Name[ja]=安全に取り除く
Name[kk]=Қауіпсіз алып шығу
Name[km]=យកចេញ​ដោយ​សុវត្ថិភាព
Name[lt]=Saugiai pašalinti
Name[mk]=Безбедно отстрани
Name[ms]=Buang Dengan Selamat
Name[nb]=Sikker fjerning
Name[nds]=Seker rutnehmen
Name[ne]=सुरक्षीत रुपमा हटाउनुहोस्
Name[nl]=Veilig verwijderen
Name[nn]=Trygg fjerning
Name[pa]=ਸੁਰੱਖਿਅਤ ਹਟਾਓ
Name[pl]=Usuń w sposób bezpieczny
Name[pt]=Retirar com Segurança
Name[pt_BR]=Remover de Modo Seguro
Name[ro]=Scoate în siguranță
Name[ru]=Безопасно извлечь
Name[rw]=Gukuramo Neza
Name[se]=Dorvvošlaš eretváldin
Name[sk]=Bezpečne odpojiť
Name[sl]=Varno odstrani
Name[sr]=Безбедно уклони
Name[sr@Latn]=Bezbedno ukloni
Name[sv]=Säker urkoppling
Name[ta]=பாதுகாப்பாக நீக்கு
Name[te]=జాగరత్తగా తియి
Name[tg]=Баровардани бехетар
Name[th]=ถอดออกอย่างปลอดภัย
Name[tr]=Güvenli Kaldır
Name[tt]=İmin Çığaru
Name[uk]=Безпечно вилучити
Name[uz]=Эҳтиётлик билан узиш
Name[vi]=Gỡ ra An toàn
Name[wa]=Ositer e såvrité
Name[zh_CN]=安全删除
Name[zh_TW]=安全的移除
Exec=kio_umountwrapper %u
X-Ubuntu-Gettext-Domain=desktop_tdebase

@ -1,12 +1,10 @@
# Default version for this component # Default version for this component
%define kdecomp kio-umountwrapper %define kdecomp kio-umountwrapper
%define version 0.2
%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_prefix}/share/doc %define _docdir %{_datadir}/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
@ -18,8 +16,8 @@ BuildRequires: autoconf automake libtool m4
Name: trinity-%{kdecomp} Name: trinity-%{kdecomp}
Summary: progress dialog for safely removing devices in Trinity. Summary: progress dialog for safely removing devices in Trinity.
Version: %{?version} Version: 0.2
Release: %{?release}%{?dist}%{?_variant} Release: 3%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities Group: Applications/Utilities
@ -32,6 +30,7 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz Source0: %{kdecomp}-3.5.13.tar.gz
Source1: media_safelyremove.desktop
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
@ -78,19 +77,45 @@ export PATH="%{_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
%__install -D -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
#%__install -D -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
%__install -D -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%post
for f in konqueror d3lphin; do
alternatives --install \
%{_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \
media_safelyremove.desktop_${f} \
%{_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \
20
done
%postun
if [ $1 -eq 0 ]; then
for f in konqueror d3lphin; do
alternatives --remove \
media_safelyremove.desktop_${f} \
%{_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper
done
fi
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO %doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/kio_umountwrapper %{_bindir}/kio_umountwrapper
%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
#%{_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
%Changelog %Changelog
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-3
- Add 'desktop' file, to make this program useful :-)
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-2 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-2
- Rebuilt for Fedora 17 - Rebuilt for Fedora 17
- Removes post and postun - Removes post and postun

File diff suppressed because it is too large Load Diff

@ -1,7 +1,7 @@
# Default version for this component # Default version for this component
%define kdecomp koffice %define kdecomp koffice
%define version 1.6.3 %define version 1.6.3
%define release 4 %define release 5
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
@ -11,6 +11,7 @@
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
%define tde_appdir %{_datadir}/applications/kde
%define tde_docdir %{_docdir}/kde %define tde_docdir %{_docdir}/kde
%define tde_includedir %{_includedir}/kde %define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/trinity %define tde_libdir %{_libdir}/trinity
@ -70,6 +71,14 @@ Patch12: koffice-3.5.13-fix_gcc47_compilation.patch
Patch13: koffice-3.5.13-fix_ruby_1.9.patch Patch13: koffice-3.5.13-fix_ruby_1.9.patch
# [koffice] Fix compilation with libpng [Bug #603] # [koffice] Fix compilation with libpng [Bug #603]
Patch14: koffice-3.5.13-fix_libpng.patch Patch14: koffice-3.5.13-fix_libpng.patch
# [koffice] Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3]
# Clean up lib paths in LDFLAGS - moved to LIBADD
# For KWord and and KPresenter added linking kspell2
# For KSpread added linking kutils
Patch15: koffice-3.5.13-fix_bug_657.patch
# [koffice] Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307]
Source1: koffice-3.5.13-damaged_binary_files.tar.gz
# BuildRequires: world-devel ;) # BuildRequires: world-devel ;)
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdelibs-devel
@ -245,12 +254,8 @@ Requires: %{name}-core = %{version}-%{release}
Summary: A powerful formula editor Summary: A powerful formula editor
Group: Applications/Productivity Group: Applications/Productivity
Requires: %{name}-core = %{version}-%{release} Requires: %{name}-core = %{version}-%{release}
#if 0%{?fedora} > 9
Requires: lyx-cmex10-fonts Requires: lyx-cmex10-fonts
#else %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
#Requires: mathml-fonts
#endif
%if 0%{?fedora} > 10
Requires: dejavu-lgc-sans-fonts Requires: dejavu-lgc-sans-fonts
%else %else
Requires: dejavu-lgc-fonts Requires: dejavu-lgc-fonts
@ -299,6 +304,8 @@ This package is part of the TDE Office Suite.
%prep %prep
%setup -q -n applications/%{kdecomp} %setup -q -n applications/%{kdecomp}
%setup -q -n applications/%{kdecomp} -a 1
#patch0 -p1 #patch0 -p1
#patch1 -p1 #patch1 -p1
%patch2 -p1 %patch2 -p1
@ -315,6 +322,7 @@ This package is part of the TDE Office Suite.
%patch13 -p1 -b .ruby %patch13 -p1 -b .ruby
%patch14 -p1 -b .libpng %patch14 -p1 -b .libpng
%endif %endif
%patch15 -p1
# use LGC variant instead # use LGC variant instead
%__sed -i.dejavu-lgc \ %__sed -i.dejavu-lgc \
@ -380,7 +388,7 @@ done
popd popd
desktop-file-install \ desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications/kde \ --dir=%{buildroot}%{tde_appdir} \
--vendor="" \ --vendor="" \
--delete-original \ --delete-original \
%{buildroot}%{_datadir}/applnk/Office/*.desktop %{buildroot}%{_datadir}/applnk/Office/*.desktop
@ -541,9 +549,9 @@ update-desktop-database -q &> /dev/null ||:
%{_datadir}/servicetypes/koplugin.desktop %{_datadir}/servicetypes/koplugin.desktop
%{_datadir}/servicetypes/kwmailmerge.desktop %{_datadir}/servicetypes/kwmailmerge.desktop
%{_datadir}/servicetypes/widgetfactory.desktop %{_datadir}/servicetypes/widgetfactory.desktop
%{_datadir}/applications/kde/*koffice.desktop %{tde_appdir}/*koffice.desktop
%{_datadir}/applications/kde/*KThesaurus.desktop %{tde_appdir}/*KThesaurus.desktop
%{_datadir}/applications/kde/*koshell.desktop %{tde_appdir}/*koshell.desktop
%{_datadir}/apps/kofficewidgets/ %{_datadir}/apps/kofficewidgets/
%if 0%{?with_kross} > 0 %if 0%{?with_kross} > 0
%{_datadir}/apps/kross/ %{_datadir}/apps/kross/
@ -599,7 +607,7 @@ update-desktop-database -q &> /dev/null ||:
%{_datadir}/services/kwserial*.desktop %{_datadir}/services/kwserial*.desktop
%{_datadir}/templates/TextDocument.desktop %{_datadir}/templates/TextDocument.desktop
%{_datadir}/templates/.source/TextDocument.kwt %{_datadir}/templates/.source/TextDocument.kwt
%{_datadir}/applications/kde/*kword.desktop %{tde_appdir}/*kword.desktop
%files kspread %files kspread
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -622,7 +630,7 @@ update-desktop-database -q &> /dev/null ||:
%{_datadir}/services/kspread*.desktop %{_datadir}/services/kspread*.desktop
%{_datadir}/templates/SpreadSheet.desktop %{_datadir}/templates/SpreadSheet.desktop
%{_datadir}/templates/.source/SpreadSheet.kst %{_datadir}/templates/.source/SpreadSheet.kst
%{_datadir}/applications/kde/*kspread.desktop %{tde_appdir}/*kspread.desktop
%if 0%{?with_kross} > 0 %if 0%{?with_kross} > 0
%{tde_libdir}/kspreadscripting.* %{tde_libdir}/kspreadscripting.*
%{tde_libdir}/krosskspreadcore.* %{tde_libdir}/krosskspreadcore.*
@ -641,7 +649,7 @@ update-desktop-database -q &> /dev/null ||:
%{_datadir}/services/kpresenter*.desktop %{_datadir}/services/kpresenter*.desktop
%{_datadir}/templates/Presentation.desktop %{_datadir}/templates/Presentation.desktop
%{_datadir}/templates/.source/Presentation.kpt %{_datadir}/templates/.source/Presentation.kpt
%{_datadir}/applications/kde/*kpresenter.desktop %{tde_appdir}/*kpresenter.desktop
%files karbon %files karbon
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -656,7 +664,7 @@ update-desktop-database -q &> /dev/null ||:
%{_datadir}/servicetypes/karbon_module.desktop %{_datadir}/servicetypes/karbon_module.desktop
%{_datadir}/templates/Illustration.desktop %{_datadir}/templates/Illustration.desktop
%{_datadir}/templates/.source/Illustration.karbon %{_datadir}/templates/.source/Illustration.karbon
%{_datadir}/applications/kde/*karbon.desktop %{tde_appdir}/*karbon.desktop
%files kugar %files kugar
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -674,8 +682,8 @@ update-desktop-database -q &> /dev/null ||:
%{_datadir}/apps/kudesigner/ %{_datadir}/apps/kudesigner/
%{_datadir}/apps/kugar/ %{_datadir}/apps/kugar/
%{_datadir}/services/kugar*.desktop %{_datadir}/services/kugar*.desktop
%{_datadir}/applications/kde/*kugar.desktop %{tde_appdir}/*kugar.desktop
%{_datadir}/applications/kde/*kudesigner.desktop %{tde_appdir}/*kudesigner.desktop
%files kexi %files kexi
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -699,7 +707,7 @@ update-desktop-database -q &> /dev/null ||:
%{_datadir}/services/kexi/ %{_datadir}/services/kexi/
%{_datadir}/apps/kexi/ %{_datadir}/apps/kexi/
%{_datadir}/services/kformdesigner/* %{_datadir}/services/kformdesigner/*
%{_datadir}/applications/kde/*kexi.desktop %{tde_appdir}/*kexi.desktop
%{_datadir}/services/kexidb_sqlite*driver.desktop %{_datadir}/services/kexidb_sqlite*driver.desktop
%if 0%{?with_kross} > 0 %if 0%{?with_kross} > 0
%{_bindir}/krossrunner %{_bindir}/krossrunner
@ -730,7 +738,7 @@ update-desktop-database -q &> /dev/null ||:
%{tde_libdir}/*kchart*.* %{tde_libdir}/*kchart*.*
%{_datadir}/apps/kchart/ %{_datadir}/apps/kchart/
%{_datadir}/services/kchart*.desktop %{_datadir}/services/kchart*.desktop
%{_datadir}/applications/kde/*kchart.desktop %{tde_appdir}/*kchart.desktop
%files kformula %files kformula
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -740,7 +748,7 @@ update-desktop-database -q &> /dev/null ||:
%{tde_libdir}/*kformula*.* %{tde_libdir}/*kformula*.*
%{_datadir}/apps/kformula/ %{_datadir}/apps/kformula/
%{_datadir}/services/kformula*.desktop %{_datadir}/services/kformula*.desktop
%{_datadir}/applications/kde/*kformula.desktop %{tde_appdir}/*kformula.desktop
%files kivio %files kivio
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -753,7 +761,7 @@ update-desktop-database -q &> /dev/null ||:
%{_datadir}/apps/kivio/ %{_datadir}/apps/kivio/
%{_datadir}/config.kcfg/kivio.kcfg %{_datadir}/config.kcfg/kivio.kcfg
%{_datadir}/services/kivio*.desktop %{_datadir}/services/kivio*.desktop
%{_datadir}/applications/kde/*kivio.desktop %{tde_appdir}/*kivio.desktop
%files filters %files filters
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -818,7 +826,7 @@ update-desktop-database -q &> /dev/null ||:
%{tde_libdir}/libkplatopart.* %{tde_libdir}/libkplatopart.*
%{_datadir}/apps/kplato/ %{_datadir}/apps/kplato/
%{_datadir}/services/kplatopart.desktop %{_datadir}/services/kplatopart.desktop
%{_datadir}/applications/kde/*kplato.desktop %{tde_appdir}/*kplato.desktop
%files chalk %files chalk
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -985,7 +993,7 @@ update-desktop-database -q &> /dev/null ||:
%endif %endif
%files chalk-data %files chalk-data
%{_datadir}/applications/kde/chalk.desktop %{tde_appdir}/chalk.desktop
%{_datadir}/applnk/.hidden/chalk_*.desktop %{_datadir}/applnk/.hidden/chalk_*.desktop
%{_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop %{_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop
%{_datadir}/apps/chalk %{_datadir}/apps/chalk
@ -997,6 +1005,14 @@ update-desktop-database -q &> /dev/null ||:
%changelog %changelog
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-5
- Fix kformula dependancies (for RHEL6)
- Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3]
Clean up lib paths in LDFLAGS - moved to LIBADD
For KWord and and KPresenter added linking kspell2
For KSpread added linking kutils
- Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307]
* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-4 * Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-4
- Updates BuildRequires - Updates BuildRequires
- Build for Fedora 17 - Build for Fedora 17

@ -1,7 +1,5 @@
# Default version for this component # Default version for this component
%define kdecomp kradio %define kdecomp kradio
%define version 0.1.1.1
%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
@ -11,6 +9,7 @@
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
%define tde_appdir %{_datadir}/applications/kde
%define tde_docdir %{_docdir}/kde %define tde_docdir %{_docdir}/kde
%define tde_includedir %{_includedir}/kde %define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/trinity %define tde_libdir %{_libdir}/trinity
@ -18,8 +17,8 @@ BuildRequires: autoconf automake libtool m4
Name: trinity-%{kdecomp} Name: trinity-%{kdecomp}
Summary: Comfortable Radio Application for KDE [Trinity] Summary: Comfortable Radio Application for KDE [Trinity]
Version: %{?version} Version: 0.1.1.1
Release: %{?release}%{?dist}%{?_variant} Release: 3%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities Group: Applications/Utilities
@ -41,9 +40,10 @@ BuildRequires: gettext
BuildRequires: libsndfile-devel BuildRequires: libsndfile-devel
BuildRequires: lirc-devel BuildRequires: lirc-devel
BuildRequires: lame-devel
%description %description
KRadio is a comfortable radio application for KDE 3.x with support for KRadio is a comfortable radio application for Trinity with support for
V4L and V4L2 radio cards drivers. V4L and V4L2 radio cards drivers.
KRadio currently provides KRadio currently provides
@ -104,12 +104,14 @@ for f in hicolor locolor ; do
touch --no-create %{_datadir}/icons/${f} || : touch --no-create %{_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
done done
update-desktop-database -q &> /dev/null ||:
%postun %postun
for f in hicolor locolor ; do for f in hicolor locolor ; do
touch --no-create %{_datadir}/icons/${f} || : touch --no-create %{_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
done done
update-desktop-database -q &> /dev/null ||:
%files -f %{kdecomp}.lang %files -f %{kdecomp}.lang
@ -118,15 +120,15 @@ done
%{_bindir}/kradio %{_bindir}/kradio
%{_libdir}/kradio/plugins/*.la %{_libdir}/kradio/plugins/*.la
%{_libdir}/kradio/plugins/*.so %{_libdir}/kradio/plugins/*.so
%{_datadir}/applications/kde/kradio.desktop %{tde_appdir}/kradio.desktop
%{_datadir}/apps/kradio/default-dot-lircrc %{_datadir}/apps/kradio/
%{_datadir}/apps/kradio/icons/hicolor/*/*/*.png
%{_datadir}/apps/kradio/icons/locolor/*/*/*.png
%{_datadir}/apps/kradio/presets/*/*.krp
%{_datadir}/apps/kradio/presets/*/*/*.krp
%{_datadir}/locale/*/LC_MESSAGES/kradio-*.mo %{_datadir}/locale/*/LC_MESSAGES/kradio-*.mo
%Changelog %Changelog
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-3
- Rebuild for RHEL 5
- Fix postinstall
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-2 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-2
- Rebuild for Fedora 17 - Rebuild for Fedora 17
- Fix HTML directory location - Fix HTML directory location

@ -1,7 +1,5 @@
# Default version for this component # Default version for this component
%define kdecomp kuickshow %define kdecomp kuickshow
%define version 0.8.13
%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
@ -18,8 +16,8 @@ BuildRequires: autoconf automake libtool m4
Name: trinity-%{kdecomp} Name: trinity-%{kdecomp}
Summary: Quick picture viewer for KDE Summary: Quick picture viewer for KDE
Version: %{?version} Version: 0.8.13
Release: %{?release}%{?dist}%{?_variant} Release: 4%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities Group: Applications/Utilities
@ -28,6 +26,8 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz Source0: %{kdecomp}-3.5.13.tar.gz
# [kuickshow] Rename old tq methods that no longer need a unique name [Commit #8712ab46] # [kuickshow] Rename old tq methods that no longer need a unique name [Commit #8712ab46]
@ -39,8 +39,6 @@ Patch2: bp002-bdeb8b3a.diff
# [kuickshow] Remove inadvertent renaming [Commit #d97e403f] [Bug #863] # [kuickshow] Remove inadvertent renaming [Commit #d97e403f] [Bug #863]
Patch3: bp003-d97e403f.diff Patch3: bp003-d97e403f.diff
Conflicts: trinity-kdegraphics
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdelibs-devel
BuildRequires: trinity-kdebase-devel BuildRequires: trinity-kdebase-devel
@ -109,15 +107,18 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_bindir}/* %{_bindir}/*
%{_datadir}/applications/*/*.desktop %{_datadir}/applications/*/*.desktop
%{_datadir}/apps/*/ %{_datadir}/apps/*/
%{tde_docdir}/HTML/en/*/
%{_datadir}/icons/hicolor/*/*/* %{_datadir}/icons/hicolor/*/*/*
%{_libdir}/libkdeinit_%{kdecomp}.so %{_libdir}/lib[kt]deinit_%{kdecomp}.so
%{_libdir}/*.la %{_libdir}/*.la
%{tde_libdir}/*.so %{tde_libdir}/*.so
%{tde_libdir}/*.la %{tde_libdir}/*.la
%{tde_docdir}/HTML/en/*/
%Changelog %Changelog
* Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
- Removes conflict with 'kdegraphics'
* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3 * Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
- Rename old tq methods that no longer need a unique name [Commit #8712ab46] - Rename old tq methods that no longer need a unique name [Commit #8712ab46]
- Remove additional unneeded tq method conversions [Commit #28d9c774] - Remove additional unneeded tq method conversions [Commit #28d9c774]

@ -0,0 +1,18 @@
commit 59ee4f6630e6ed6b2712600a88d3ba9ce383620b
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1339467335 -0500
Fix tdesu/tdesudo argument compatibility problem
diff --git a/kdesu/kdesu/kdesu.cpp b/kdesu/kdesu/kdesu.cpp
index 3511b1f..8ea82fb 100644
--- a/kdesu/kdesu/kdesu.cpp
+++ b/kdesu/kdesu/kdesu.cpp
@@ -63,6 +63,7 @@ static KCmdLineOptions options[] = {
{ "p <prio>", I18N_NOOP("Set priority value: 0 <= prio <= 100, 0 is lowest"), "50" },
{ "r", I18N_NOOP("Use realtime scheduling"), 0 },
{ "nonewdcop", I18N_NOOP("Let command use existing dcopserver"), 0 },
+ { "comment <comment>", I18N_NOOP("Ignored"), "" },
{ "noignorebutton", I18N_NOOP("Do not display ignore button"), 0 },
{ "i <icon name>", I18N_NOOP("Specify icon to use in the password dialog"), 0},
{ "d", I18N_NOOP("Do not show the command to be run in the dialog"), 0},

@ -0,0 +1,20 @@
commit 0afb2d8a78d212568f6836dd0e7d41382cfb991d
Author: Slávek Banko <slavek.banko@axis.cz>
Date: 1341682699 +0200
Fix menu crash with disabled search field
This resolves Bug 1081
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index b7cfe8f..702c921 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -273,6 +273,8 @@ void PanelKMenu::initialize()
connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)),
this, TQT_SLOT( slotUpdateSearch( const TQString&)));
insertItem(hbox, searchLineID, 0);
+ } else {
+ searchEdit = NULL;
}
//TQToolTip::add(clearButton, i18n("Clear Search"));

@ -19,7 +19,7 @@
Name: trinity-tdebase Name: trinity-tdebase
Version: 3.5.13 Version: 3.5.13
Release: 24%{?release}%{?dist}%{?_variant} Release: 25%{?release}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Trinity Base Programs Summary: Trinity Base Programs
Group: User Interface/Desktops Group: User Interface/Desktops
@ -159,7 +159,8 @@ Patch58: kdebase-3.5.13-fix_khtml_smooth_scrolling.patch
Patch59: kdebase-3.5.13-fix_fancy_logout.patch Patch59: kdebase-3.5.13-fix_fancy_logout.patch
## [tdebase] Update default konqueror maximum image preview size to 10MB. [Commit #03e19305] ## [tdebase] Update default konqueror maximum image preview size to 10MB. [Commit #03e19305]
Patch60: kdebase-3.5.13-update_default_konq_max_image_prev_size.patch Patch60: kdebase-3.5.13-update_default_konq_max_image_prev_size.patch
## [tdebase] Fix menu crash with disabled search field [Bug #1081] [Commit #0afb2d8a]
Patch61: kdebase-3.5.13-fix_menu_crash_with_disabled_search.patch
### FEDORA / RHEL distribution-specific settings ### ### FEDORA / RHEL distribution-specific settings ###
@ -2179,6 +2180,7 @@ ever launching another application.
%exclude %{_datadir}/apps/konqueror/servicemenus/konsolehere.desktop %exclude %{_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
%exclude %{_datadir}/apps/konqueror/servicemenus/installfont.desktop %exclude %{_datadir}/apps/konqueror/servicemenus/installfont.desktop
%{_datadir}/apps/konqueror/servicemenus/*.desktop %{_datadir}/apps/konqueror/servicemenus/*.desktop
%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
%{_datadir}/apps/konqueror/tiles/*.png %{_datadir}/apps/konqueror/tiles/*.png
%{_datadir}/autostart/konqy_preload.desktop %{_datadir}/autostart/konqy_preload.desktop
%{_datadir}/config.kcfg/keditbookmarks.kcfg %{_datadir}/config.kcfg/keditbookmarks.kcfg
@ -2200,6 +2202,11 @@ for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{_datadir}/icons/${f} 2> /dev/null || : gtk-update-icon-cache --quiet %{_datadir}/icons/${f} 2> /dev/null || :
done done
/sbin/ldconfig || : /sbin/ldconfig || :
alternatives --install \
%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
media_safelyremove.desktop_konqueror \
%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
10
%postun -n trinity-konqueror %postun -n trinity-konqueror
update-desktop-database %{tde_appdir} 2> /dev/null || : update-desktop-database %{tde_appdir} 2> /dev/null || :
@ -2208,6 +2215,11 @@ for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{_datadir}/icons/${f} 2> /dev/null || : gtk-update-icon-cache --quiet %{_datadir}/icons/${f} 2> /dev/null || :
done done
/sbin/ldconfig || : /sbin/ldconfig || :
if [ $1 -eq 0 ]; then
alternatives --remove \
media_safelyremove.desktop_konqueror
%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
fi
########## ##########
@ -2857,6 +2869,7 @@ Konqueror libraries.
%patch58 -p1 %patch58 -p1
%patch59 -p1 %patch59 -p1
%patch60 -p1 %patch60 -p1
%patch61 -p1
# Applies an optional distro-specific graphical theme # Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != "" %if "%{?tde_bg}" != ""
@ -2978,6 +2991,11 @@ cd build
%__rm -f "%{?buildroot}%{_datadir}/apps/usb.ids" %__rm -f "%{?buildroot}%{_datadir}/apps/usb.ids"
%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{_datadir}/apps/usb.ids" %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{_datadir}/apps/usb.ids"
# Makes 'media_safelyremove.desktop' an alternative
%__mv -f %{buildroot}%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop %{buildroot}%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
%__ln_s /etc/alternatives/media_safelyremove.desktop_tdebase %{buildroot}%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop
%clean %clean
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
@ -2988,6 +3006,10 @@ cd build
%changelog %changelog
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-25
- Fix menu crash with disabled search field [Bug #1081] [Commit #0afb2d8a]
- Makes 'media_safelyremove.desktop' an alternative
* Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-24 * Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-24
- Renames 'tdebase' to 'trinity-tdebase' - Renames 'tdebase' to 'trinity-tdebase'
- Update default konqueror maximum image preview size to 10MB. [Commit #03e19305] - Update default konqueror maximum image preview size to 10MB. [Commit #03e19305]

@ -0,0 +1,17 @@
commit d655a9f8e32b1e948f54eb8e0f33b5de629e25b3
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1340997300 -0500
Fix corrupt image file.
Thanks to E. Liddell.
diff --git a/ksvg/test/tiger.svg b/ksvg/test/tiger.svg
index f2c1391..4a2e3b5 100644
--- a/ksvg/test/tiger.svg
+++ b/ksvg/test/tiger.svg
@@ -1,4 +1,4 @@
-<svg>
+<svg xmlns="http://www.w3.org/2000/svg">
<g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
<path d="M-122.304 84.285C-122.304 84.285 -122.203 86.179 -123.027 86.16C-123.851 86.141 -140.305 38.066 -160.833 40.309C-160.833 40.309 -143.05 32.956 -122.304 84.285z"/>
</g>

@ -5,14 +5,15 @@
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
%define tde_appdir %{_datadir}/applications/kde
%define tde_docdir %{_docdir}/kde %define tde_docdir %{_docdir}/kde
%define tde_includedir %{_includedir}/kde %define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/trinity %define tde_libdir %{_libdir}/trinity
Name: trinity-kdegraphics Name: trinity-tdegraphics
Version: 3.5.13 Version: 3.5.13
Release: 4%{?dist}%{_variant} Release: 5%{?dist}%{_variant}
License: GPL License: GPL
Summary: Trinity Desktop Environment - Graphics Applications Summary: Trinity Desktop Environment - Graphics Applications
@ -43,6 +44,8 @@ Patch4: kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch
Patch5: kdegraphics-3.5.13-fix_gcc47_compilation.patch Patch5: kdegraphics-3.5.13-fix_gcc47_compilation.patch
# [kdegraphics] Fix FTBFS due to poppler-tqt # [kdegraphics] Fix FTBFS due to poppler-tqt
Patch6: kdegraphics-3.5.13-fix_poppler_support.patch Patch6: kdegraphics-3.5.13-fix_poppler_support.patch
# [tdegraphics] Fix corrupt image file. [Commit #d655a9f8]
Patch7: kdegraphics-3.5.13-fix_corrupt_image_file.patch
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
@ -86,65 +89,769 @@ BuildRequires: libGL-devel libGLU-devel libXi-devel
# kuickshow # kuickshow
BuildRequires: imlib-devel BuildRequires: imlib-devel
BuildRequires: fribidi-devel BuildRequires: fribidi-devel
Requires: tqtinterface #Requires: tqtinterface
Requires: trinity-arts #Requires: trinity-arts
Requires: trinity-kdelibs #Requires: trinity-kdelibs
Requires: ghostscript
Requires: %{name}-libs = %{version}-%{release}
Obsoletes: trinity-kdegraphics < %{version}-%{release}
%if "%{_prefix}" == "/usr" Provides: trinity-kdegraphics = %{version}-%{release}
Provides: kdegraphics3 = %{version}-%{release} Obsoletes: trinity-kdegraphics-libs < %{version}-%{release}
Conflicts: kdegraphics Provides: trinity-kdegraphics-libs = %{version}-%{release}
%endif Obsoletes: trinity-kdegraphics-extras < %{version}-%{release}
Provides: trinity-kdegraphics-extras = %{version}-%{release}
Requires: trinity-kamera = %{version}-%{release}
Requires: trinity-kcoloredit = %{version}-%{release}
Requires: %{name}-kfile-plugins = %{version}-%{release}
Requires: trinity-kdvi = %{version}-%{release}
Requires: trinity-kfax = %{version}-%{release}
Requires: trinity-kfaxview = %{version}-%{release}
Requires: trinity-kgamma = %{version}-%{release}
Requires: trinity-kghostview = %{version}-%{release}
Requires: trinity-kiconedit = %{version}-%{release}
Requires: trinity-kmrml = %{version}-%{release}
Requires: trinity-kolourpaint = %{version}-%{release}
Requires: trinity-kooka = %{version}-%{release}
Requires: trinity-kpdf = %{version}-%{release}
Requires: trinity-kpovmodeler = %{version}-%{release}
Requires: trinity-kruler = %{version}-%{release}
Requires: trinity-ksnapshot = %{version}-%{release}
Requires: trinity-ksvg = %{version}-%{release}
Requires: trinity-kview = %{version}-%{release}
Requires: trinity-kviewshell = %{version}-%{release}
Requires: trinity-libkscan = %{version}-%{release}
Requires: %{name}-libpoppler-tqt = %{version}-%{release}
%description %description
Graphics applications for the Trinity Desktop Environment, including Graphics applications for the Trinity Desktop Environment, including
* kamera (digital camera support) * kamera (digital camera support)
* kcoloredit (palette editor and color chooser) * kcoloredit (palette editor and color chooser)
* kdvi (displays TeX .dvi files) * kdvi (displays TeX .dvi files)
* kfax
* kfaxview
* kghostview (displays postscript files) * kghostview (displays postscript files)
* kiconedit (icon editor) * kiconedit (icon editor)
* kooka (scanner application) * kooka (scanner application)
* kpdf (displays PDF files) * kpdf (displays PDF files)
* kpovmodler
* kruler (screen ruler and color measurement tool) * kruler (screen ruler and color measurement tool)
* ksnapshot (screen capture utility) * ksnapshot (screen capture utility)
* kview (image viewer for GIF, JPEG, TIFF, etc.) * kview (image viewer for GIF, JPEG, TIFF, etc.)
%files
##########
%package -n trinity-kamera
Summary: Digital camera io_slave for Konqueror
Group: Applications/Graphics
%description -n trinity-kamera
This is a digital camera io_slave for TDE which uses gphoto2 and libgpio
to allow access to your camera's pictures with the URL camera:/
%post -n trinity-kamera
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kamera
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%files -n trinity-kamera
%defattr(-,root,root,-)
%{tde_libdir}/kcm_kamera.la
%{tde_libdir}/kcm_kamera.so
%{tde_libdir}/kio_kamera.la
%{tde_libdir}/kio_kamera.so
%{tde_appdir}/kamera.desktop
%{_datadir}/icons/crystalsvg/*/actions/camera_test.png
%{_datadir}/icons/crystalsvg/*/apps/camera.png
%{_datadir}/icons/crystalsvg/*/devices/camera.png
%{_datadir}/icons/crystalsvg/*/filesystems/camera.png
%{_datadir}/services/camera.protocol
%{tde_docdir}/HTML/en/kamera/
##########
%package -n trinity-kcoloredit
Summary: A color palette editor and color picker for TDE
Group: Applications/Graphics
%description -n trinity-kcoloredit
This package contains two programs, a color palette editor and also a color
picker.
%files -n trinity-kcoloredit
%defattr(-,root,root,-)
%{_bindir}/kcolorchooser
%{_bindir}/kcoloredit
%{tde_appdir}/kcolorchooser.desktop
%{tde_appdir}/kcoloredit.desktop
%{_datadir}/apps/kcoloredit/kcoloreditui.rc
%{_datadir}/icons/hicolor/*/apps/kcolorchooser.png
%{_datadir}/icons/hicolor/*/apps/kcoloredit.png
%{tde_docdir}/HTML/en/kcoloredit/
##########
%package kfile-plugins
Summary: TDE metainfo plugins for graphic files
Group: Environment/Libraries
%description kfile-plugins
This packages provides meta information for graphic files (file sizes,
tags, etc. all from within the file manager).
%files kfile-plugins
%defattr(-,root,root,-)
%{tde_libdir}/gsthumbnail.la
%{tde_libdir}/gsthumbnail.so
%{tde_libdir}/kfile_bmp.la
%{tde_libdir}/kfile_bmp.so
%{tde_libdir}/kfile_dds.la
%{tde_libdir}/kfile_dds.so
%{tde_libdir}/kfile_dvi.la
%{tde_libdir}/kfile_dvi.so
%{tde_libdir}/kfile_exr.la
%{tde_libdir}/kfile_exr.so
%{tde_libdir}/kfile_gif.la
%{tde_libdir}/kfile_gif.so
%{tde_libdir}/kfile_ico.la
%{tde_libdir}/kfile_ico.so
%{tde_libdir}/kfile_jpeg.la
%{tde_libdir}/kfile_jpeg.so
%{tde_libdir}/kfile_pcx.la
%{tde_libdir}/kfile_pcx.so
%{tde_libdir}/kfile_pdf.la
%{tde_libdir}/kfile_pdf.so
%{tde_libdir}/kfile_png.la
%{tde_libdir}/kfile_png.so
%{tde_libdir}/kfile_pnm.la
%{tde_libdir}/kfile_pnm.so
%{tde_libdir}/kfile_ps.la
%{tde_libdir}/kfile_ps.so
%{tde_libdir}/kfile_raw.la
%{tde_libdir}/kfile_raw.so
%{tde_libdir}/kfile_rgb.la
%{tde_libdir}/kfile_rgb.so
%{tde_libdir}/kfile_tga.la
%{tde_libdir}/kfile_tga.so
%{tde_libdir}/kfile_tiff.la
%{tde_libdir}/kfile_tiff.so
%{tde_libdir}/kfile_xbm.la
%{tde_libdir}/kfile_xbm.so
%{tde_libdir}/kfile_xpm.la
%{tde_libdir}/kfile_xpm.so
%{_datadir}/services/gsthumbnail.desktop
%{_datadir}/services/kfile_bmp.desktop
%{_datadir}/services/kfile_dds.desktop
%{_datadir}/services/kfile_dvi.desktop
%{_datadir}/services/kfile_exr.desktop
%{_datadir}/services/kfile_gif.desktop
%{_datadir}/services/kfile_ico.desktop
%{_datadir}/services/kfile_jpeg.desktop
%{_datadir}/services/kfile_pcx.desktop
%{_datadir}/services/kfile_pdf.desktop
%{_datadir}/services/kfile_png.desktop
%{_datadir}/services/kfile_pnm.desktop
%{_datadir}/services/kfile_ps.desktop
%{_datadir}/services/kfile_raw.desktop
%{_datadir}/services/kfile_rgb.desktop
%{_datadir}/services/kfile_tga.desktop
%{_datadir}/services/kfile_tiff.desktop
%{_datadir}/services/kfile_xbm.desktop
%{_datadir}/services/kfile_xpm.desktop
##########
%package -n trinity-kdvi
Summary: Dvi viewer for TDE
Group: Applications/Graphics
%description -n trinity-kdvi
This program and KPart allow the user to display *.DVI files from TeX.
%files -n trinity-kdvi
%defattr(-,root,root,-)
%{_bindir}/kdvi
%{tde_libdir}/kdvipart.la
%{tde_libdir}/kdvipart.so
%{tde_appdir}/kdvi.desktop
%{_datadir}/apps/kdvi/
%{_datadir}/config.kcfg/kdvi.kcfg
%{_datadir}/icons/hicolor/*/apps/kdvi.png
%{_datadir}/icons/hicolor/scalable/apps/kdvi.svgz
%{_datadir}/services/kdvimultipage.desktop
%{tde_docdir}/HTML/en/kdvi/
##########
%package -n trinity-kfax
Summary: G3/G4 fax viewer for Trinity
Group: Applications/Graphics
Requires: libtiff
%description -n trinity-kfax
A fax viewer for Trinity, supporting the display of raw and tiffed fax images
(g3, g3-2d, g4).
%files -n trinity-kfax
%defattr(-,root,root,-)
%doc rpmdocs/kfax/
%{_bindir}/kfax
%{tde_appdir}/kfax.desktop
%{_datadir}/apps/kfax/
%{_datadir}/icons/hicolor/??x??/apps/kfax.png
%{_datadir}/icons/hicolor/scalable/apps/kfax.svgz
##########
%package -n trinity-kfaxview
Summary: G3/G4 fax viewer for Trinity using kviewshell
Group: Applications/Graphics
%description -n trinity-kfaxview
A fax viewer for Trinity, supporting the display of raw and tiffed fax images
(g3, g3-2d, g4).
This faxviewer uses kviewshell and is intended to replace the standalone
kfax application once it reproduces all of kfax's features.
%files -n trinity-kfaxview
%defattr(-,root,root,-)
%{_bindir}/kfaxview
%{_libdir}/libkfaximage.so.*
%{_libdir}/libkfaximage.so
%{_libdir}/libkfaximage.la
%{tde_libdir}/kfaxviewpart.*
%{tde_appdir}/kfaxview.desktop
%{_datadir}/apps/kfaxview/
%{_datadir}/icons/hicolor/??x??/apps/kfaxview.png
%{_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
%{_datadir}/services/kfaxmultipage.desktop
%{_datadir}/services/kfaxmultipage_tiff.desktop
##########
%package -n trinity-kgamma
Summary: Gamma correction module for the Trinity Control Center
Group: Applications/Graphics
%description -n trinity-kgamma
KGamma is a Trinity Control Center module for gamma calibration/correction
of XFree86. With proper gamma settings, your display (websites, images,
etc.) will look the same on your monitor as on other monitors.
Homepage: http://kgamma.berlios.de/index2.php
%files -n trinity-kgamma
%defattr(-,root,root,-)
%{_bindir}/xf86gammacfg
%{tde_libdir}/kcm_kgamma.la
%{tde_libdir}/kcm_kgamma.so
%{tde_appdir}/kgamma.desktop
%{_datadir}/apps/kgamma/
%{_datadir}/icons/hicolor/*/apps/kgamma.png
%{tde_docdir}/HTML/en/kgamma/
##########
%package -n trinity-kghostview
Summary: PostScript viewer for Trinity
Group: Applications/Graphics
Requires: ghostscript
%description -n trinity-kghostview
KGhostview is Trinity's PostScript viewer. It is a port of Tim Theisen's
Ghostview program which is used to view documents prepared in Adobe's
PostScript page description language. PostScript is the major page
description language for printing on UNIX systems, and this application is
useful to preview material intended for printing, or for reading documents
online.
%files -n trinity-kghostview
%defattr(-,root,root,-)
%{_bindir}/kghostview
%{tde_libdir}/libkghostviewpart.la
%{tde_libdir}/libkghostviewpart.so
%{_libdir}/libkghostviewlib.so.*
%{tde_appdir}/kghostview.desktop
%{_datadir}/apps/kconf_update/kghostview.upd
%{_datadir}/apps/kconf_update/update-to-xt-names.pl
%{_datadir}/apps/kghostview/
%{_datadir}/config.kcfg/kghostview.kcfg
%{_datadir}/icons/hicolor/*/apps/kghostview.png
%{_datadir}/services/kghostview_part.desktop
%{tde_docdir}/HTML/en/kghostview/
##########
%package -n trinity-kiconedit
Summary: An icon editor for Trinity
Group: Applications/Graphics
%description -n trinity-kiconedit
KIconedit allows you easily to create and edit icons.
%files -n trinity-kiconedit
%defattr(-,root,root,-)
%{_bindir}/kiconedit
%{tde_appdir}/kiconedit.desktop
%{_datadir}/apps/kiconedit/
%{_datadir}/icons/hicolor/*/apps/kiconedit.png
%{tde_docdir}/HTML/en/kiconedit/
##########
%package -n trinity-kmrml
Summary: A Konqueror plugin for searching pictures
Group: Applications/Graphics
%description -n trinity-kmrml
MRML is short for Multimedia Retrieval Markup Language, which defines a
protocol for querying a server for images based on their content. See
http://www.mrml.net about MRML and the GNU Image Finding Tool (GIFT), an
MRML server.
%files -n trinity-kmrml
%defattr(-,root,root,-)
%{_bindir}/mrmlsearch
%{tde_libdir}/kcm_kmrml.la
%{tde_libdir}/kcm_kmrml.so
%{tde_libdir}/kded_daemonwatcher.la
%{tde_libdir}/kded_daemonwatcher.so
%{tde_libdir}/kio_mrml.la
%{tde_libdir}/kio_mrml.so
%{tde_libdir}/libkmrmlpart.la
%{tde_libdir}/libkmrmlpart.so
%{tde_libdir}/mrmlsearch.la
%{tde_libdir}/mrmlsearch.so
%{_libdir}/lib[kt]deinit_mrmlsearch.so
%{tde_appdir}/kcmkmrml.desktop
%{_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop
%{_datadir}/mimelnk/text/mrml.desktop
%{_datadir}/services/kded/daemonwatcher.desktop
%{_datadir}/services/mrml.protocol
%{_datadir}/services/mrml_part.desktop
##########
%package -n trinity-kolourpaint
Summary: A simple paint program for Trinity
Group: Applications/Graphics
%description -n trinity-kolourpaint
KolourPaint is a very simple paint program for Trinity. It aims to be
conceptually simple to understand; providing a level of functionality
targeted towards the average user. It's designed for daily tasks like:
* Painting - drawing diagrams and "finger painting"
* Image Manipulation - editing screenshots and photos; applying effects
* Icon Editing - drawing clipart and logos with transparency
It's not an unusable and monolithic program where simple tasks like
drawing lines become near impossible. Nor is it so simple that it lacks
essential features like Undo/Redo.
Homepage: http://kolourpaint.sourceforge.net
%files -n trinity-kolourpaint
%defattr(-,root,root,-)
%{_bindir}/kolourpaint
%{tde_appdir}/kolourpaint.desktop
%{_datadir}/apps/kolourpaint/
%{_datadir}/icons/hicolor/*/apps/kolourpaint.png
%{_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz
%{tde_docdir}/HTML/en/kolourpaint/
##########
%package -n trinity-kooka
Summary: Scanner program for Trinity
Group: Applications/Graphics
%description -n trinity-kooka
Kooka is an open source GNU/Linux scan program based on SANE and
KScan library.
Kooka helps you to handle the most important scan parameters, find the
correct image file format to save and manage your scanned images. It
offers support for different OCR modules. Libkscan, a autonomous part
of Kooka, provides a scan service for easy and consistent use to all
KDE applications.
Install ocrad or gocr if you wish to enable optical character recognition
in kooka.
Homepage: http://kooka.kde.org/
%files -n trinity-kooka
%defattr(-,root,root,-)
%{_datadir}/config/kookarc
%{_bindir}/kooka
%{tde_appdir}/kooka.desktop
%{_datadir}/apps/kooka/
%{tde_docdir}/HTML/en/kooka/
##########
%package -n trinity-kpdf
Summary: PDF viewer for Trinity
Group: Applications/Graphics
#Recommends: kghostview-trinity (= ${binary:Version})
%description -n trinity-kpdf
KPDF allows you to view PDF (Portable Document Format) files. This package
includes kpdfpart so you can embed in konqueror or run as a standalone
application.
%files -n trinity-kpdf
%defattr(-,root,root,-)
%{_bindir}/kpdf
%{tde_libdir}/libkpdfpart.la
%{tde_libdir}/libkpdfpart.so
%{tde_appdir}/kpdf.desktop
%{_datadir}/apps/kpdf/shell.rc
%{_datadir}/apps/kpdfpart/part.rc
%{_datadir}/config.kcfg/kpdf.kcfg
%{tde_docdir}/HTML/en/kpdf/
%{_datadir}/icons/hicolor/*/apps/kpdf.png
%{_datadir}/icons/hicolor/scalable/apps/kpdf.svgz
%{_datadir}/services/kpdf_part.desktop
##########
%package -n trinity-kpovmodeler
Summary: A graphical editor for povray scenes
Group: Applications/Graphics
#Requires: povray
%description -n trinity-kpovmodeler
KPovmodeler is KDE's graphical editor for povray scenes. KPovModeler is a
modeling and composition program for creating POV-Ray scenes in KDE.
For most modelers, POV-Ray is nothing but a rendering engine. This greatly
limits the innate possibilities of the POV-Ray scripted language. This
is not the case for KPovModeler, which allows you to use all the features
of POV-Ray through the translation of POV-Ray language into a graphical
tree.
kpovmodeler uses the povray package, currently available only in Debian's
non-free, unsupported repository.
Homepage: http://www.kpovmodeler.org
%files -n trinity-kpovmodeler
%defattr(-,root,root,-)
%doc rpmdocs/kpovmodeler/
%{_bindir}/kpovmodeler
%{_libdir}/libkpovmodeler.so.*
%{_libdir}/libkpovmodeler.la
%{tde_libdir}/libkpovmodelerpart.*
%{tde_appdir}/kpovmodeler.desktop
%{_datadir}/apps/kpovmodeler/
%{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
%{_datadir}/icons/hicolor/*/apps/kpovmodeler.*
%doc %{tde_docdir}/HTML/en/kpovmodeler/
##########
%package -n trinity-kruler
Summary: A screen ruler and color measurement tool for Trinity
Group: Applications/Graphics
%description -n trinity-kruler
Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
%files -n trinity-kruler
%defattr(-,root,root,-)
%{_bindir}/kruler
%{tde_appdir}/kruler.desktop
%{_datadir}/applnk/Graphics/kruler.desktop
%{_datadir}/apps/kruler/
%{_datadir}/icons/hicolor/*/apps/kruler.png
%{tde_docdir}/HTML/en/kruler/
##########
%package -n trinity-ksnapshot
Summary: Screenshot utility for Trinity
Group: Applications/Graphics
%description -n trinity-ksnapshot
KSnapshot is a simple applet for taking screenshots. It is capable of
capturing images of either the whole desktop or just a single window.
The images can then be saved in a variety of formats.
%files -n trinity-ksnapshot
%defattr(-,root,root,-)
%{_bindir}/ksnapshot
%{tde_appdir}/ksnapshot.desktop
%{tde_docdir}/HTML/en/ksnapshot/
%{_datadir}/icons/hicolor/*/apps/ksnapshot.png
%{_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
##########
%package -n trinity-ksvg
Summary: SVG viewer for Trinity
Group: Applications/Graphics
%description -n trinity-ksvg
KSVG allows you view SVG (scalable vector graphics) files. This package
includes kpart so you can embed it in konqueror and a standalone
application.
%files -n trinity-ksvg
%defattr(-,root,root,-)
%{_bindir}/printnodetest
%{_bindir}/svgdisplay
%{tde_libdir}/libksvgplugin.la
%{tde_libdir}/libksvgplugin.so
%{tde_libdir}/libksvgrendererlibart.la
%{tde_libdir}/libksvgrendererlibart.so
%{tde_libdir}/svgthumbnail.la
%{tde_libdir}/svgthumbnail.so
%{_libdir}/libksvg.so.0
%{_libdir}/libksvg.so.0.0.1
%{_libdir}/libtext2path.so.0
%{_libdir}/libtext2path.so.0.0.0
%{_datadir}/apps/ksvg/ksvgplugin.rc
%{_datadir}/services/ksvglibartcanvas.desktop
%{_datadir}/services/ksvgplugin.desktop
%{_datadir}/services/svgthumbnail.desktop
%{_datadir}/servicetypes/ksvgrenderer.desktop
##########
%package -n trinity-kview
Summary: Simple image viewer/converter for Trinity
Group: Applications/Graphics
%description -n trinity-kview
KView is a simple image viewer and converter application. It supports
a number of plugins, which add an array of basic editing capabilities
as well.
%files -n trinity-kview
%defattr(-,root,root,-)
%{_bindir}/kview
%{tde_libdir}/kcm_kviewcanvasconfig.la
%{tde_libdir}/kcm_kviewcanvasconfig.so
%{tde_libdir}/kcm_kviewgeneralconfig.la
%{tde_libdir}/kcm_kviewgeneralconfig.so
%{tde_libdir}/kcm_kviewpluginsconfig.la
%{tde_libdir}/kcm_kviewpluginsconfig.so
%{tde_libdir}/kcm_kviewpresenterconfig.la
%{tde_libdir}/kcm_kviewpresenterconfig.so
%{tde_libdir}/kcm_kviewviewerpluginsconfig.la
%{tde_libdir}/kcm_kviewviewerpluginsconfig.so
%{tde_libdir}/kview.la
%{tde_libdir}/kview.so
%{tde_libdir}/kview_browserplugin.la
%{tde_libdir}/kview_browserplugin.so
%{tde_libdir}/kview_effectsplugin.la
%{tde_libdir}/kview_effectsplugin.so
%{tde_libdir}/kview_presenterplugin.la
%{tde_libdir}/kview_presenterplugin.so
%{tde_libdir}/kview_scannerplugin.la
%{tde_libdir}/kview_scannerplugin.so
%{tde_libdir}/libkviewcanvas.la
%{tde_libdir}/libkviewcanvas.so
%{tde_libdir}/libkviewviewer.la
%{tde_libdir}/libkviewviewer.so
%{_libdir}/lib[kt]deinit_kview.so
%{_libdir}/libkimageviewer.so.*
%{tde_libdir}/libphotobook.la
%{tde_libdir}/libphotobook.so
%{tde_appdir}/kview.desktop
%{_datadir}/apps/kview/
%{_datadir}/apps/kviewviewer/
%{_datadir}/apps/photobook/photobookui.rc
%{_datadir}/icons/crystalsvg/*/apps/photobook.png
%{_datadir}/icons/hicolor/*/apps/kview.png
%{_datadir}/services/kconfiguredialog/kviewcanvasconfig.desktop
%{_datadir}/services/kconfiguredialog/kviewgeneralconfig.desktop
%{_datadir}/services/kconfiguredialog/kviewpluginsconfig.desktop
%{_datadir}/services/kconfiguredialog/kviewpresenterconfig.desktop
%{_datadir}/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
%{_datadir}/services/kviewcanvas.desktop
%{_datadir}/services/kviewviewer.desktop
%{_datadir}/services/photobook.desktop
%{_datadir}/servicetypes/kimageviewer.desktop
%{_datadir}/servicetypes/kimageviewercanvas.desktop
%{tde_docdir}/HTML/en/kview/
##########
%package -n trinity-kviewshell
Summary: Generic framework for viewer applications in Trinity
Group: Applications/Graphics
%description -n trinity-kviewshell
KViewShell is a generic viewing framework that allows the graphical
applications, such as the kview image viewer, to be embedded in other
KDE applications, such as Konqueror.
KViewShell comes with a djvuviewpart plugin included, for viewing
DjVu images.
%files -n trinity-kviewshell
%defattr(-,root,root,-)
%{_bindir}/kviewshell
%{_libdir}/libdjvu.la
%{_libdir}/libdjvu.so
%{tde_libdir}/djvuviewpart.so
%{tde_libdir}/djvuviewpart.la
%{tde_libdir}/emptymultipagepart.la
%{tde_libdir}/emptymultipagepart.so
%{tde_libdir}/kviewerpart.la
%{tde_libdir}/kviewerpart.so
%{_libdir}/libkmultipage.so.*
%{_datadir}/apps/djvumultipage.rc
%{_datadir}/apps/kviewerpart/
%{_datadir}/apps/kviewshell/kviewshell.rc
%{_datadir}/config.kcfg/djvumultipage.kcfg
%{_datadir}/config.kcfg/kviewshell.kcfg
%{_datadir}/icons/crystalsvg/*/apps/kviewshell.png
%{_datadir}/services/emptymultipage.desktop
%{_datadir}/services/djvumultipage.desktop
%{_datadir}/servicetypes/kmultipage.desktop
##########
%package -n trinity-libkscan
Summary: Scanner library for Trinity
Group: Environment/Libraries
%description -n trinity-libkscan
KScan is TDE's scanner library. It's used by kooka and by koffice currently.
It provides an easy-to-use library, which allows you to access your scanner
(as long as it's sane compatible).
%files -n trinity-libkscan
%defattr(-,root,root,-)
%{_libdir}/libkscan.so.*
%{_datadir}/icons/crystalsvg/16x16/actions/palette_color.png
%{_datadir}/icons/crystalsvg/16x16/actions/palette_gray.png
%{_datadir}/icons/crystalsvg/16x16/actions/palette_halftone.png
%{_datadir}/icons/crystalsvg/16x16/actions/palette_lineart.png
%{_datadir}/services/scanservice.desktop
##########
%package -n trinity-libkscan-devel
Summary: Development files for the Trinity scanner library
Group: Development/Libraries
%description -n trinity-libkscan-devel
This package contains development files for Trinity's scanner library.
%files -n trinity-libkscan-devel
%defattr(-,root,root,-)
%{_libdir}/libkscan.la
%{_libdir}/libkscan.so
##########
%package libpoppler-tqt
Summary: TQt support for Poppler
Group: Environment/Libraries
%description libpoppler-tqt
TQt support library for Poppler.
This library is used by the Trinity graphics file plugins for PDF support.
%files libpoppler-tqt
%defattr(-,root,root,-)
%{_libdir}/libpoppler-tqt.so.*
##########
%package libpoppler-tqt-devel
Summary: Development files for TQt support for Poppler
Group: Development/Libraries
Requires: %{name}-libpoppler-tqt
%description libpoppler-tqt-devel
Development files of TQt support library for Poppler.
This package contains the development files needed to compile applications against poppler-tqt.
%files libpoppler-tqt-devel
%defattr(-,root,root,-)
%{tde_includedir}/poppler-link-qt3.h
%{tde_includedir}/poppler-page-transition.h
%{tde_includedir}/poppler-qt.h
%{_libdir}/libpoppler-tqt.la
%{_libdir}/libpoppler-tqt.so
#%{_libdir}/pkgconfig/poppler-tqt.pc
##########
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Provides: kdegraphics3-devel = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Group: Development/Libraries Group: Development/Libraries
%description devel
%{summary}.
## FIXME: move more stuff to -extras Obsoletes: trinity-kdegraphics-devel < %{version}-%{release}
%package extras Provides: trinity-kdegraphics-devel = %{version}-%{release}
Summary: Extra applications from %{name}
Group: Applications/Multimedia
Requires: %{name}-libs = %{version}-%{release}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%description extras Requires: trinity-libkscan-devel = %{version}-%{release}
%{summary}, including: Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
* kfax
* kfaxview
* kpovmodler
%package libs %description devel
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: trinity-kdelibs >= %{version}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
%description libs
%{summary}. %{summary}.
%files devel
%defattr(-,root,root,-)
%{_includedir}/dom/
#%{_includedir}/kfaximage.h
%{_includedir}/kmultipageInterface.h
%{_includedir}/ksvg/
%{_includedir}/kviewshell/
%{_includedir}/libtext2path-0.1/BezierPath.h
%{_includedir}/libtext2path-0.1/Glyph.h
%{_includedir}/libtext2path-0.1/GlyphTracer.h
%{_libdir}/lib[kt]deinit_kview.la
%{_libdir}/lib[kt]deinit_mrmlsearch.la
%{_libdir}/libkghostviewlib.la
%{_libdir}/libkghostviewlib.so
%{_libdir}/libkimageviewer.la
%{_libdir}/libkimageviewer.so
%{_libdir}/libkmultipage.la
%{_libdir}/libkmultipage.so
%{_libdir}/libkpovmodeler.la
%{_libdir}/libkpovmodeler.so
%{_libdir}/libksvg.la
%{_libdir}/libksvg.so
%{_libdir}/libtext2path.la
%{_libdir}/libtext2path.so
%{_datadir}/cmake/*
############
# Excludes kuickshow (built separately)
%exclude %{_bindir}/kuickshow
%exclude %{tde_libdir}/kuickshow.la
%exclude %{tde_libdir}/kuickshow.so
%exclude %{_libdir}/lib[kt]deinit_kuickshow.la
%exclude %{_libdir}/lib[kt]deinit_kuickshow.so
%exclude %{tde_appdir}/kuickshow.desktop
%exclude %{_datadir}/apps/kuickshow/
%exclude %{_datadir}/icons/hicolor/*/apps/kuickshow.png
%exclude %{tde_docdir}/HTML/en/kuickshow/
##########
%prep %prep
%setup -q -n kdegraphics %setup -q -n kdegraphics
@ -157,8 +864,8 @@ Requires: %{name} = %{version}-%{release}
%patch4 -p1 %patch4 -p1
%patch5 -p1 -b .gcc47 %patch5 -p1 -b .gcc47
%patch6 -p1 -b .poppler %patch6 -p1 -b .poppler
%patch7 -p1
# Hardcoded path
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
@ -223,148 +930,12 @@ rm -f %{buildroot}/libkpovmodeler.so
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%post
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%post extras
/sbin/ldconfig ||:
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun extras
/sbin/ldconfig ||:
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%files extras
%defattr(-,root,root,-)
# kfax
%doc rpmdocs/kfax/
%{_bindir}/kfax
%{_datadir}/applications/kde/kfax.desktop
%{_datadir}/apps/kfax/
%{_datadir}/icons/hicolor/??x??/apps/kfax.png
%{_datadir}/icons/hicolor/scalable/apps/kfax.svgz
# kfaxview
%{_bindir}/kfaxview
%{_libdir}/libkfaximage.so
%{_libdir}/libkfaximage.la
%{tde_libdir}/kfaxviewpart.*
%{_datadir}/applications/kde/kfaxview.desktop
%{_datadir}/apps/kfaxview/
%{_datadir}/icons/hicolor/??x??/apps/kfaxview.png
%{_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
%{_datadir}/services/kfaxmultipage.desktop
%{_datadir}/services/kfaxmultipage_tiff.desktop
# kpovmodeler
%doc rpmdocs/kpovmodeler/
%doc %{tde_docdir}/HTML/en/kpovmodeler/
%{_bindir}/kpovmodeler
%{_libdir}/libkpovmodeler.so.*
%{_libdir}/libkpovmodeler.la
%{tde_libdir}/libkpovmodelerpart.*
%{_datadir}/applications/kde/kpovmodeler.desktop
%{_datadir}/apps/kpovmodeler/
%{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
%{_datadir}/icons/hicolor/*/apps/kpovmodeler.*
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%doc rpmdocs/*
# kfax
%exclude %{_bindir}/kfax
%exclude %{_datadir}/applications/kde/kfax.desktop
%exclude %{_datadir}/apps/kfax/
%exclude %{_datadir}/icons/hicolor/*/apps/kfax.*
# kfaxview
%exclude %{_bindir}/kfaxview
%exclude %{_libdir}/libkfaximage.so
%exclude %{_libdir}/libkfaximage.la
%exclude %{tde_libdir}/kfaxviewpart.*
%exclude %{_datadir}/applications/kde/kfaxview.desktop
%exclude %{_datadir}/apps/kfaxview/
%exclude %{_datadir}/icons/hicolor/*/apps/kfaxview.*
%exclude %{_datadir}/services/kfaxmultipage.desktop
%exclude %{_datadir}/services/kfaxmultipage_tiff.desktop
# kpovmodeler
%exclude %{tde_docdir}/HTML/en/kpovmodeler/
%exclude %{_bindir}/kpovmodeler
%exclude %{_libdir}/libkpovmodeler.*
%exclude %{tde_libdir}/libkpovmodelerpart.*
%exclude %{_datadir}/applications/kde/kpovmodeler.desktop
%exclude %{_datadir}/apps/kpovmodeler/
%exclude %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
%exclude %{_datadir}/icons/hicolor/*/apps/kpovmodeler.*
%{_bindir}/*
%{_datadir}/applications/kde/*.desktop
%{_datadir}/applnk/Graphics/*kruler.desktop
%{_datadir}/apps/*
%{_datadir}/icons/crystalsvg/*/*/*
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/config*/*
%{_datadir}/service*/*
%{_datadir}/mimelnk/*/*
%{_libdir}/libkdeinit_*.so
%{tde_libdir}/*
%files libs
%defattr(-,root,root,-)
%exclude %{_libdir}/libkfaximage.la
%exclude %{_libdir}/libkpovmodeler.la
%exclude %{_libdir}/libkpovmodeler.so.*
%{_libdir}/lib*.so.*
%{_libdir}/lib*.la
# Why ???
%{_libdir}/libdjvu.so
%files devel
%defattr(-,root,root,-)
%{tde_includedir}/poppler-link-qt3.h
%{tde_includedir}/poppler-page-transition.h
%{tde_includedir}/poppler-qt.h
%{_includedir}/dom/*
%{_includedir}/ksvg/*
%{_includedir}/kviewshell/*
%{_includedir}/libtext2path-0.1/*
%{_includedir}/kmultipageInterface.h
%{_datadir}/cmake/*.cmake
%{_libdir}/lib*.so
#exclude %{_libdir}/libkpovmodeler.so
%exclude %{_libdir}/libkfaximage.so
%exclude %{_libdir}/libkdeinit_*.so
%exclude %{_libdir}/libdjvu.so
%changelog %changelog
* Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
- Renames 'kdegraphics' to 'tdegraphics'
- Split in several packages
* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 * Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Rebuild with poppler 0.12 for RHEL 5 - Rebuild with poppler 0.12 for RHEL 5
- Re-adds qt-poppler include files - Re-adds qt-poppler include files

@ -5,6 +5,7 @@
%endif %endif
# TDE 3.5.13 specific variables # TDE 3.5.13 specific variables
%define tde_appdir %{_datadir}/applications/kde
%define tde_docdir %{_docdir}/kde %define tde_docdir %{_docdir}/kde
%define tde_includedir %{_includedir}/kde %define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/trinity %define tde_libdir %{_libdir}/trinity
@ -12,7 +13,7 @@
Name: trinity-kdevelop Name: trinity-kdevelop
Summary: Integrated Development Environment for C++/C Summary: Integrated Development Environment for C++/C
Version: 3.5.13 Version: 3.5.13
Release: 3%{?dist}%{?_variant} Release: 4%{?dist}%{?_variant}
License: GPLv2 License: GPLv2
@ -40,12 +41,9 @@ Patch3: kdevelop-3.5.13-gcc47.patch
# [c_cpp_ref] Fix installation of 'asm' files # [c_cpp_ref] Fix installation of 'asm' files
Patch4: c_cpp_reference-2.0.2-install.patch Patch4: c_cpp_reference-2.0.2-install.patch
Provides: kdevelop3 = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Requires: trinity-kdelibs-devel
Requires: make Requires: make
Requires: perl Requires: perl
Requires: flex >= 2.5.4 Requires: flex >= 2.5.4
@ -56,8 +54,7 @@ Requires: ctags
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel BuildRequires: trinity-arts-devel
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-tdelibs-devel
BuildRequires: trinity-kdelibs-apidocs
BuildRequires: qt3-devel-docs BuildRequires: qt3-devel-docs
BuildRequires: db4-devel BuildRequires: db4-devel
BuildRequires: flex BuildRequires: flex
@ -96,9 +93,7 @@ individual needs.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries Group: Development/Libraries
Provides: kdevelop3-devel = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Requires: trinity-kdelibs-devel
%description devel %description devel
%{summary}. %{summary}.
@ -106,8 +101,6 @@ Requires: trinity-kdelibs-devel
Summary: %{name} runtime libraries Summary: %{name} runtime libraries
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: trinity-kdelibs Requires: trinity-kdelibs
# helps multilib upgrades
Obsoletes: %{name} < %{version}-%{release}
# include to be paranoid, installing libs-only is still mostly untested -- Rex # include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description libs %description libs
@ -207,7 +200,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_bindir}/* %{_bindir}/*
%{tde_libdir}/* %{tde_libdir}/*
%{_libdir}/kconf_update_bin/* %{_libdir}/kconf_update_bin/*
%{_datadir}/applications/kde/* %{tde_appdir}/*
%{_datadir}/apps/* %{_datadir}/apps/*
%{_datadir}/config/* %{_datadir}/config/*
%{_datadir}/desktop-directories/* %{_datadir}/desktop-directories/*
@ -230,6 +223,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog %changelog
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Removes runtime dependency to 'trinity-kdelibs'
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 * Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Fix installation on Fedora 17 - Fix installation on Fedora 17
- Fix compilation on GCC 4.7 - Fix compilation on GCC 4.7

Loading…
Cancel
Save