TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM Packaging: update R14 packages

Browse Source
pull/3/head
François Andriot 11 years ago
parent 3b0463ff46
commit 47864a912b
9 changed files with 43 additions and 62 deletions
Show Stats Download Patch File Download Diff File

14
redhat/applications/kbfx/kbfx-14.0.0.spec
Unescape View File

@ -105,13 +105,13 @@ cd build
-DDATA_INSTALL_DIR=%{tde_datadir}/apps \ -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \ -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \
-DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \ -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}"\
-DDOC_INSTALL_DIR=%{tde_tdedocdir} \ -DDOC_INSTALL_DIR=%{tde_tdedocdir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \
\ \
-DUSE_STRIGI=OFF \ -DUSE_STRIGI=OFF \
-DUSE_MENUDRAKE=OFF \ -DUSE_MENUDRAKE=OFF \
-DBUILD_DOC=ON \ -DBUILD_ALL=ON \
-DBUILD_ALL=OFF \
.. ..
# Not SMP safe ! # Not SMP safe !
@ -166,12 +166,14 @@ update-desktop-database %{tde_appdir} &> /dev/null
%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop %{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop %{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop %{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
#%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg %{tde_tdedocdir}/HTML/en/kbfxconfigapp/
#%{tde_tdedocdir}/HTML/en/kbfxconfigapp/ %{tde_docdir}/kbfx/
%{tde_tdedocdir}/kbfx/
%{tde_datadir}/icons/hicolor/*/apps/kbfx.png %{tde_datadir}/icons/hicolor/*/apps/kbfx.png
%{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png %{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png
#%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo %lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/kbfxconfigapp.mo
%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo
%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo
%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo
%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop %{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop

4
redhat/applications/klcddimmer/klcddimmer-14.0.0.spec
Unescape View File

@ -99,8 +99,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
%find_lang %{tde_pkg}
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
@ -115,7 +113,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%files -f %{tde_pkg}.lang %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING LICENSE NEWS README %doc AUTHORS COPYING LICENSE NEWS README
%{tde_libdir}/klcddimmer_panelapplet.la %{tde_libdir}/klcddimmer_panelapplet.la

4
redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
Unescape View File

@ -111,9 +111,7 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-new-ldflags \ --enable-new-ldflags \
--enable-closure \ --enable-closure \
--enable-rpath \ --enable-rpath \
--enable-gcc-hidden-visibility \ --enable-gcc-hidden-visibility
\
--with-extra-includes=/usr/include/cdda
%__make %{?_smp_mflags} %__make %{?_smp_mflags}

6
redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
Unescape View File

@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch1: tde-guidance-14.0.0-tqt3.patch #Patch1: tde-guidance-14.0.0-tqt3.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-arts-devel >= 1:1.5.10
@ -146,7 +146,9 @@ or can be run as standalone applications.
%exclude %{tde_datadir}/apps/guidance/MonitorsDB %exclude %{tde_datadir}/apps/guidance/MonitorsDB
# Files from powermanager # Files from powermanager
%if 0%{?with_powermanager}
%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png %exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
%endif
%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png %exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
%exclude %{tde_datadir}/apps/guidance/pics/battery*.png %exclude %{tde_datadir}/apps/guidance/pics/battery*.png
%exclude %{tde_datadir}/apps/guidance/pics/processor.png %exclude %{tde_datadir}/apps/guidance/pics/processor.png
@ -259,7 +261,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .tqt3 #patch1 -p1 -b .tqt3
%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
%__sed -i "userconfig/unixauthdb.py" \ %__sed -i "userconfig/unixauthdb.py" \

10
redhat/buildall-r14.sh
Unescape View File

@ -135,10 +135,10 @@ grpiui tdeutils
if ! is_installed trinity-desktop; then if ! is_installed trinity-desktop; then
grpiu extras/trinity-desktop grpiu extras/trinity-desktop
eval ${PKGINST} trinity-desktop || exit 1 eval ${PKGINST} trinity-desktop || exit 1
# Disable trinity repository from here !!! fi
if [ -r "/etc/yum.repos.d/trinity-3.5.13.repo" ]; then # Disable trinity repository from here !!!
sed -i "/etc/yum.repos.d/trinity-3.5.13.repo" -e "s|enabled=.*|enabled=0|g" if [ -r "/etc/yum.repos.d/trinity.repo" ]; then
fi sudo sed -i "/etc/yum.repos.d/trinity.repo" -e "s|enabled=.*|enabled=0|g"
fi fi
# devel packages # devel packages
@ -152,7 +152,7 @@ fi
# Extra libraries # Extra libraries
## IMLIB1: required for kuickshow ## IMLIB1: required for kuickshow
if ! is_installed imlib1-devel; then if ! is_installed imlib1-devel && ! is_installed imlib-devel; then
grpiu 3rdparty/imlib1 grpiu 3rdparty/imlib1
eval ${PKGINST} imlib1-devel || exit 1 eval ${PKGINST} imlib1-devel || exit 1
fi fi

1
redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
Unescape View File

@ -14,6 +14,7 @@ License: GPL
Summary: TQt bindings for Python Summary: TQt bindings for Python
Group: System Environment/Libraries Group: System Environment/Libraries
Obsoletes: PyQt
Obsoletes: trinity-PyQt Obsoletes: trinity-PyQt
Obsoletes: trinity-python-qt3 Obsoletes: trinity-python-qt3

32
redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
Unescape View File

@ -93,7 +93,6 @@ Requires: trinity-digikam
Requires: trinity-dolphin Requires: trinity-dolphin
Requires: trinity-filelight Requires: trinity-filelight
Requires: trinity-gwenview Requires: trinity-gwenview
Requires: trinity-gwenview-i18n
Requires: trinity-k3b Requires: trinity-k3b
Requires: trinity-k9copy Requires: trinity-k9copy
Requires: trinity-kaffeine Requires: trinity-kaffeine
@ -204,6 +203,7 @@ Obsoletes: trinity-tde-guidance-powermanager
# Debian/Ubuntu specific ... # Debian/Ubuntu specific ...
#Requires: trinity-adept #Requires: trinity-adept
#Requires: trinity-gwenview-i18n
# Beagle does not exist anymore, so Kerry is now useless. # Beagle does not exist anymore, so Kerry is now useless.
#Requires: trinity-kerry #Requires: trinity-kerry
@ -309,7 +309,7 @@ Summary: Default wallpaper for Trinity
%__sed %{SOURCE0} \ %__sed %{SOURCE0} \
-e 's/\$releasever/%{fedora}/g' \ -e 's/\$releasever/%{fedora}/g' \
-e 's/-fedora/-f%{fedora}/g' \ -e 's/-fedora/-f%{fedora}/g' \
>"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo" >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity.repo"
%endif %endif
# RHEL configuration for YUM # RHEL configuration for YUM
@ -317,10 +317,11 @@ Summary: Default wallpaper for Trinity
%if 0%{?rhel} %if 0%{?rhel}
%__sed %{SOURCE1} \ %__sed %{SOURCE1} \
-e 's/\$releasever/%{rhel}/g' \ -e 's/\$releasever/%{rhel}/g' \
>"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo" >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity.repo"
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
%__sed -i %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo -e "s|3.5.13|r14|g"
%__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo %__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo
%endif %endif
@ -336,26 +337,5 @@ Summary: Default wallpaper for Trinity
%endif %endif
%changelog %changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Update to version 3.5.13.2 - Initial build for TDE R14
- Add GPG signing key
* Mon Oct 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Update to version 3.5.13.1
* Mon Aug 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
- Add 'applications' subpackage
* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
- Updates to reflect new packages names
- Add Mageia 2 support
- Removes 'extras' packages
* Wed Jun 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Enable mirrorlist
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Fix repo files name and content
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Add 'repo' package

4
redhat/tdeaddons/tdeaddons-14.0.0.spec
Unescape View File

@ -244,8 +244,8 @@ a tab bar, a Python browser and even more.
Summary: Trinity file dialog plugins for text files and folders Summary: Trinity file dialog plugins for text files and folders
Group: Applications/Utilities Group: Applications/Utilities
Obsoletes: trinity-kfile-plugins < %{version}-%{release} Obsoletes: trinity-tdeaddons-kfile-plugins < %{version}-%{release}
Provides: trinity-kfile-plugins = %{version}-%{release} Provides: trinity-tdeaddons-kfile-plugins = %{version}-%{release}
%description tdefile-plugins %description tdefile-plugins
This is a collection of plugins for the TDE file dialog. These plugins This is a collection of plugins for the TDE file dialog. These plugins

30
redhat/tdebase/tdebase-14.0.0.spec
Unescape View File

@ -389,6 +389,7 @@ BuildRequires: gnome-screensaver
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif %endif
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
BuildRequires: xscreensaver
BuildRequires: libXScrnSaver-devel BuildRequires: libXScrnSaver-devel
%endif %endif
%if 0%{?suse_version} == 1140 %if 0%{?suse_version} == 1140
@ -3337,20 +3338,22 @@ cd build
-DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \ -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
-DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \ -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
\ \
-DWITH_ALL_OPTIONS=ON \
-DWITH_SASL=ON \ -DWITH_SASL=ON \
-DWITH_LDAP=ON \ -DWITH_LDAP=ON \
-DWITH_SAMBA=ON \ -DWITH_SAMBA=ON \
%{?with_exr:-DWITH_OPENEXR=ON} \ %{?!with_exr:-DWITH_OPENEXR=OFF} \
-DWITH_XCOMPOSITE=ON \ -DWITH_XCOMPOSITE=ON \
-DWITH_XCURSOR=ON \ -DWITH_XCURSOR=ON \
-DWITH_XFIXES=ON \ -DWITH_XFIXES=ON \
%{?with_xrandr:-DWITH_XRANDR=ON} \ %{?!with_xrandr:-DWITH_XRANDR=OFF} \
-DWITH_XRENDER=ON \ -DWITH_XRENDER=ON \
-DWITH_XDAMAGE=ON \ -DWITH_XDAMAGE=ON \
-DWITH_XEXT=ON \ -DWITH_XEXT=ON \
%{?with_xtest:-DWITH_XTEST=ON} \ %{?!with_xtest:-DWITH_XTEST=OFF} \
%{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \ -DWITH_OPENGL=ON \
%{?with_libart:-DWITH_LIBART=ON} \ %{?!with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
%{?!with_libart:-DWITH_LIBART=OFF} \
-DWITH_LIBUSB=ON \ -DWITH_LIBUSB=ON \
-DWITH_LIBRAW1394=ON \ -DWITH_LIBRAW1394=ON \
-DWITH_SUDO_TDESU_BACKEND=OFF \ -DWITH_SUDO_TDESU_BACKEND=OFF \
@ -3360,11 +3363,12 @@ cd build
-DWITH_XINERAMA=ON \ -DWITH_XINERAMA=ON \
-DWITH_ARTS=ON \ -DWITH_ARTS=ON \
-DWITH_I8K=ON \ -DWITH_I8K=ON \
%{?with_hal:-DWITH_HAL=ON} \ -DWITH_SENSORS=ON \
%{?!with_hal:-DWITH_HAL=OFF} \
-DWITH_TDEHWLIB=ON \ -DWITH_TDEHWLIB=ON \
-DWITH_UPOWER=ON \ -DWITH_UPOWER=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \
-DWITH_KDESKTOP_LOCK_BACKTRACE=OFF \ \
-DBUILD_ALL=ON \ -DBUILD_ALL=ON \
%if 0%{?suse_version} %if 0%{?suse_version}
-DKCHECKPASS_PAM_SERVICE="xdm" \ -DKCHECKPASS_PAM_SERVICE="xdm" \
@ -3373,7 +3377,7 @@ cd build
%else %else
-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
-DTDM_PAM_SERVICE="tdm-trinity" \ -DTDM_PAM_SERVICE="tdm-trinity" \
-DKSCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \ -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
%endif %endif
%{!?with_tsak:-DBUILD_TSAK=OFF} \ %{!?with_tsak:-DBUILD_TSAK=OFF} \
.. ..
@ -3396,10 +3400,6 @@ cd build
%__install -D -m 644 \ %__install -D -m 644 \
"%{?buildroot}%{tde_datadir}/apps/tdm/sessions/tde.desktop" \ "%{?buildroot}%{tde_datadir}/apps/tdm/sessions/tde.desktop" \
"%{?buildroot}%{_datadir}/xsessions/tde.desktop" "%{?buildroot}%{_datadir}/xsessions/tde.desktop"
# Force session name to be 'TDE'
%__sed -i "%{?buildroot}%{_datadir}/xsessions/tde.desktop" \
-e "s,^Name=.*,Name=TDE,"
%endif %endif
# Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora # Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora
@ -3435,7 +3435,7 @@ EOF
# TDM configuration # TDM configuration
%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/tdm/tdmrc" \ %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/tdm/tdmrc" \
%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220 %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210
-e "s/^#*MinShowUID=.*/MinShowUID=1000/" -e "s/^#*MinShowUID=.*/MinShowUID=1000/"
%else %else
-e "s/^#*MinShowUID=.*/MinShowUID=500/" -e "s/^#*MinShowUID=.*/MinShowUID=500/"
@ -3455,9 +3455,9 @@ EOF
%__mkdir_p "%{?buildroot}%{_sysconfdir}/alternatives" %__mkdir_p "%{?buildroot}%{_sysconfdir}/alternatives"
%__ln_s "%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" "%{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase" %__ln_s "%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" "%{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase"
# SUSE: creates DM config file, used by '/etc/init.d/xdm' # SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm'
# You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager' # You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
%if 0%{?suse_version} %if 0%{?suse_version} >= 1210
%__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" %__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm"
%__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g" %__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g"
%endif %endif

Write Preview
Loading…
Cancel
Save