TDE
/
tde-packaging
9
1
Fork 1
Code Issues 10 Pull Requests Releases Wiki Activity

RPM: update spec files after building 14.0.10

Browse Source
pull/78/head
François Andriot 3 years ago
parent 527c25ae5e
commit ab1604b61a
12 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File

3
redhat/Makefile
Unescape View File

@ -29,7 +29,6 @@ main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim td
libraries: kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
applications: abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
extras: icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kmpose koverartist kpacman png2qrgb
### Trinity Dependencies
@ -642,4 +641,4 @@ tarballs:
# External packages
external:
[ -d "${HOME}/rpmbuild/RPMS" ] && cp -rfv "${HOME}/rpmbuild/RPMS/"* "$(RPMDIR)"
if [ -d "${HOME}/rpmbuild/RPMS" ]; then cp -rfv "${HOME}/rpmbuild/RPMS/"* "$(RPMDIR)"; fi

2
redhat/applications/konversation/konversation.spec
Unescape View File

@ -140,7 +140,9 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
BuildRequires: xscreensaver
BuildRequires: xscreensaver-base
%if 0%{?pclinuxos} == 0
BuildRequires: xscreensaver-extrusion
%endif
BuildRequires: xscreensaver-gl
%endif
%endif

BIN
redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz
View File

Binary file not shown.

2
redhat/applications/tde-guidance/tde-guidance.spec
Unescape View File

@ -135,7 +135,9 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
BuildRequires: xscreensaver
BuildRequires: xscreensaver-base
%if 0%{?pclinuxos} == 0
BuildRequires: xscreensaver-extrusion
%endif
BuildRequires: xscreensaver-gl
%endif
%endif

10
redhat/extras/fileshareset/fileshareset.spec
Unescape View File

@ -92,11 +92,21 @@ export LDFLAGS="$LDFLAGS -pie"
mkdir -p "${RPM_BUILD_ROOT}%{_sysconfdir}/security/"
echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf"
# Remove setuid bit on some binaries.
chmod 0755 "%{?buildroot}%{_bindir}/fileshareset"
%clean
%__rm -rf $RPM_BUILD_ROOT
%post
%if 0%{?suse_version}
# Sets permissions on setuid files (openSUSE specific)
%set_permissions %{_bindir}/fileshareset
%endif
%files
%defattr(-,root,root,-)
%{_bindir}/filesharelist

9
redhat/extras/trinity-desktop/trinity-desktop.spec
Unescape View File

@ -189,6 +189,10 @@ Requires: trinity-mplayerthumbs
Requires: trinity-piklab
Requires: trinity-potracegui
#Requires: trinity-qalculate-tde
# On RHEL, lilypond is not available, so no rosegarden :'-(
%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
Requires: trinity-rosegarden
%endif
Requires: trinity-smb4k
Requires: trinity-smartcardauth
Requires: trinity-soundkonverter
@ -239,11 +243,6 @@ Obsoletes: trinity-tde-guidance-powermanager
#Requires: trinity-gtk3-tqt-engine
#Requires: trinity-qt4-tqt-theme-engine
# On RHEL 5/7, lilypond is not available, so no rosegarden :'-(
%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
Requires: trinity-rosegarden
%endif
# Compiz-related stuff does not work (obsolete)
#Requires: trinity-compizconfig-backend-kconfig
#Requires: trinity-desktop-effects-kde

5
redhat/extras/trinity-filesystem/trinity-filesystem.spec
Unescape View File

@ -626,6 +626,11 @@ for b in kcheckpass kgrantpty kpac_dhcp_helper kppp start_tdeinit tdmtsak tdekbd
echo "%{tde_bindir}/${b} root:root 4711" >>/etc/permissions.local
fi
done
for b in fileshareset ; do
if ! grep -q "^%{_bindir}/${b}" "/etc/permissions.local"; then
echo "%{_bindir}/${b} root:root 4711" >>/etc/permissions.local
fi
done
%endif

4
redhat/main/tdeaddons/tdeaddons.spec
Unescape View File

@ -138,9 +138,11 @@ BuildRequires: db4-devel
#%endif
# PYTHON2 support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
%if 0%{?rhel} >= 7 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7
%global python python2
%global __python %__python2
%else
%global python python
%endif
Requires: trinity-atlantikdesigner = %{version}-%{release}

2
redhat/main/tdeartwork/tdeartwork.spec
Unescape View File

@ -134,7 +134,9 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
BuildRequires: xscreensaver
BuildRequires: xscreensaver-base
%if 0%{?pclinuxos} == 0
BuildRequires: xscreensaver-extrusion
%endif
BuildRequires: xscreensaver-gl
%endif

8
redhat/main/tdebase/tdebase.spec
Unescape View File

@ -623,7 +623,9 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
BuildRequires: xscreensaver
BuildRequires: xscreensaver-base
%if 0%{?pclinuxos} == 0
BuildRequires: xscreensaver-extrusion
%endif
BuildRequires: xscreensaver-gl
%endif
%endif
@ -783,7 +785,7 @@ BuildRequires: libr-devel >= 0.6.0
%endif
# RPC support
%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 || 0%{?pclinuxos}
BuildRequires: libtirpc-devel
BuildRequires: rpcgen
%if 0%{?fedora}
@ -1494,9 +1496,7 @@ TDE applications, particularly those in the TDE base module.
%{tde_libdir}/libtdeinit_kxkb.la
%{tde_libdir}/libtdeinit_kxkb.so
%{tde_libdir}/libkhotkeys_shared.so.*
%if "%{?tde_version}" != "14.0.9"
%{tde_tdeappdir}/kdcop.desktop
%endif
%{tde_tdeappdir}/keyboard.desktop
%{tde_tdeappdir}/keyboard_layout.desktop
%{tde_tdeappdir}/khotkeys.desktop
@ -3703,9 +3703,7 @@ popd
%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdefontview.desktop Graphics Viewer
%{?with_tderandrtray:%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop Applet X-TDE-settings-desktop}
%suse_update_desktop_file %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop System FileManager
if [ -r %{?buildroot}%{tde_tdeappdir}/kdcop.desktop ]; then
%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/kdcop.desktop System Utility
fi
%endif
# Icons from TDE Control Center should only be displayed in TDE

4
redhat/main/tdebindings/tdebindings.spec
Unescape View File

@ -169,10 +169,12 @@ BuildRequires: Mesa-libGLU-devel
%endif
# PYTHON support
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7
%global python python2
%global __python %__python2
%global python_sitearch %{python2_sitearch}
%else
%global python python
%endif
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
BuildRequires: %{python}

2
redhat/main/tdepim/tdepim.spec
Unescape View File

@ -179,7 +179,9 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
BuildRequires: xscreensaver
BuildRequires: xscreensaver-base
%if 0%{?pclinuxos} == 0
BuildRequires: xscreensaver-extrusion
%endif
BuildRequires: xscreensaver-gl
%endif
%endif

Write Preview
Loading…
Cancel
Save