diff options
Diffstat (limited to 'redhat/applications')
12 files changed, 441 insertions, 240 deletions
diff --git a/redhat/applications/graphics/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec index 3ae976205..73562a68e 100644 --- a/redhat/applications/graphics/gwenview/gwenview.spec +++ b/redhat/applications/graphics/gwenview/gwenview.spec @@ -207,8 +207,10 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg %{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz %{tde_datadir}/man/man1/gwenview.1* +%{tde_datadir}/pixmaps/gwenview.xpm %{tde_datadir}/services/gvdirpart.desktop %{tde_datadir}/services/gvimagepart.desktop %lang(en) %{tde_tdedocdir}/HTML/en/gwenview/ + %changelog diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec index a3337d46b..16e07193b 100644 --- a/redhat/applications/internet/kvirc/kvirc.spec +++ b/redhat/applications/internet/kvirc/kvirc.spec @@ -172,10 +172,10 @@ export PATH="%{tde_bindir}:${PATH}" --with-kde-services-dir=%{tde_datadir}/services \ --with-kde-library-dir=%{tde_libdir} \ --with-kde-include-dir=%{tde_tdeincludedir} \ - --with-qt-name=tqt \ - --with-qt-library-dir=%{_libdir} \ - --with-qt-include-dir=%{_includedir}/tqt3 \ - --with-qt-moc=%{_bindir}/tmoc + --with-tqt-name=tqt \ + --with-tqt-library-dir=%{_libdir} \ + --with-tqt-include-dir=%{_includedir}/tqt3 \ + --with-tqt-moc=%{_bindir}/tmoc # Symbolic links must exist prior to parallel building %__make symlinks -C src/kvilib/build @@ -227,6 +227,8 @@ export PATH="%{tde_bindir}:${PATH}" %exclude %{tde_libdir}/kvirc/*/modules/*.so %{tde_libdir}/kvirc/ %{tde_tdeappdir}/kvirc.desktop +%{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem.upd +%{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem_upd.sh %{tde_datadir}/icons/hicolor/*/*/*.png %{tde_datadir}/icons/hicolor/*/*/*.svgz %{tde_datadir}/icons/hicolor/*/*/*.xpm diff --git a/redhat/applications/internet/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec index 285b431ec..81ad2fda6 100644 --- a/redhat/applications/internet/smb4k/smb4k.spec +++ b/redhat/applications/internet/smb4k/smb4k.spec @@ -58,11 +58,13 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: fdupes @@ -143,41 +145,44 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --program-prefix="" \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +# Warning: GCC visibility causes FTBFS [Bug #1285] +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" \ + .. -# SMP safe ! -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__rm -fr $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build %find_lang %{tde_pkg} diff --git a/redhat/applications/misc/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec index 698538c1b..1c1eb3e5e 100644 --- a/redhat/applications/misc/kcmldap/kcmldap.spec +++ b/redhat/applications/misc/kcmldap/kcmldap.spec @@ -152,6 +152,7 @@ This is a TDE control center module to manage TDE connections to Kerberos realms %dir %{tde_datadir}/pixmaps %{tde_datadir}/pixmaps/kcmldapbonding_step1.png %{tde_datadir}/pixmaps/kcmldapbonding_step3.png +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldap.mo ########## diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec index 133ef56ed..f4f4df817 100644 --- a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec +++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec @@ -157,6 +157,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker %dir %{tde_datadir}/pixmaps %{tde_datadir}/pixmaps/kcmldapcontroller_step1.png %{tde_datadir}/pixmaps/kcmldapcontroller_step4.png +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldapcontroller.mo ########## diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec index d1cba544d..f249ae50e 100644 --- a/redhat/applications/multimedia/amarok/amarok.spec +++ b/redhat/applications/multimedia/amarok/amarok.spec @@ -88,7 +88,7 @@ BuildRequires: brp-check-trinity BuildRequires: alsa-lib-devel # ESOUND support -BuildRequires: esound-devel +#BuildRequires: esound-devel # PCRE support BuildRequires: pcre-devel diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index 7775efeb5..3e2932e27 100644 --- a/redhat/applications/settings/tde-guidance/tde-guidance.spec +++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec @@ -63,12 +63,13 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: trinity-pytdeextensions BuildRequires: trinity-libpythonize0-devel BuildRequires: trinity-pytde BuildRequires: chrpath -BuildRequires: autoconf automake libtool m4 +BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -92,14 +93,6 @@ BuildRequires: pytqt-devel BuildRequires: trinity-pytde-devel BuildRequires: trinity-pytqt-tools -# LIBXXF86VM support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xxf86vm-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210 -BuildRequires: libXxf86vm-devel -%endif - # XSCREENSAVER support # RHEL 4: disabled # RHEL 6: available in EPEL @@ -191,38 +184,37 @@ or can be run as standalone applications. %{tde_tdeappdir}/*.desktop %{tde_datadir}/icons/crystalsvg/*/*/*.png %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} -%{python_sitearch}/%{name}/SMBShareSelectDialog.py* -%{python_sitearch}/%{name}/SimpleCommandRunner.py* -%{python_sitearch}/%{name}/fuser.py* -%{python_sitearch}/%{name}/fuser_ui.py* -%{python_sitearch}/%{name}/mountconfig.py* -%{python_sitearch}/%{name}/serviceconfig.py* -%{python_sitearch}/%{name}/sizeview.py* -%{python_sitearch}/%{name}/unixauthdb.py* -%{python_sitearch}/%{name}/userconfig.py* +%{python_sitelib}/tde-guidance/SMBShareSelectDialog.py* +%{python_sitelib}/tde-guidance/SimpleCommandRunner.py* +%{python_sitelib}/tde-guidance/fuser.py* +%{python_sitelib}/tde-guidance/fuser_ui.py* +%{python_sitelib}/tde-guidance/mountconfig.py* +%{python_sitelib}/tde-guidance/serviceconfig.py* +%{python_sitelib}/tde-guidance/sizeview.py* +%{python_sitelib}/tde-guidance/unixauthdb.py* +%{python_sitelib}/tde-guidance/userconfig.py* %if 0%{?rhel} == 7 -%{python_sitearch}/%{name}/__pycache__/SMBShareSelectDialog.*.pyc -%{python_sitearch}/%{name}/__pycache__/SimpleCommandRunner.*.pyc -%{python_sitearch}/%{name}/__pycache__/fuser.*.pyc -%{python_sitearch}/%{name}/__pycache__/fuser_ui.*.pyc -%{python_sitearch}/%{name}/__pycache__/mountconfig.*.pyc -%{python_sitearch}/%{name}/__pycache__/serviceconfig.*.pyc -%{python_sitearch}/%{name}/__pycache__/sizeview.*.pyc -%{python_sitearch}/%{name}/__pycache__/unixauthdb.*.pyc -%{python_sitearch}/%{name}/__pycache__/userconfig.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/SMBShareSelectDialog.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/SimpleCommandRunner.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/fuser.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/fuser_ui.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/mountconfig.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/serviceconfig.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/sizeview.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/unixauthdb.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/userconfig.*.pyc %endif %else -%pycached %{python_sitearch}/%{name}/SMBShareSelectDialog.py -%pycached %{python_sitearch}/%{name}/SimpleCommandRunner.py -%pycached %{python_sitearch}/%{name}/fuser.py -%pycached %{python_sitearch}/%{name}/fuser_ui.py -%pycached %{python_sitearch}/%{name}/mountconfig.py -%pycached %{python_sitearch}/%{name}/serviceconfig.py -%pycached %{python_sitearch}/%{name}/sizeview.py -%pycached %{python_sitearch}/%{name}/unixauthdb.py -%pycached %{python_sitearch}/%{name}/userconfig.py +%pycached %{python_sitelib}/tde-guidance/SMBShareSelectDialog.py +%pycached %{python_sitelib}/tde-guidance/SimpleCommandRunner.py +%pycached %{python_sitelib}/tde-guidance/fuser.py +%pycached %{python_sitelib}/tde-guidance/fuser_ui.py +%pycached %{python_sitelib}/tde-guidance/mountconfig.py +%pycached %{python_sitelib}/tde-guidance/serviceconfig.py +%pycached %{python_sitelib}/tde-guidance/sizeview.py +%pycached %{python_sitelib}/tde-guidance/unixauthdb.py +%pycached %{python_sitelib}/tde-guidance/userconfig.py %endif -%{tde_tdedocdir}/HTML/en/guidance/ # Files from powermanager %if 0%{?with_powermanager} @@ -232,6 +224,11 @@ or can be run as standalone applications. %exclude %{tde_datadir}/apps/guidance/pics/processor.png %endif +%{tde_tdedocdir}/HTML/en/tde-guidance/ +%{tde_mandir}/man1/mountconfig-trinity.1* +%{tde_mandir}/man1/serviceconfig-trinity.1* +%{tde_mandir}/man1/userconfig-trinity.1* + ########## %package backends @@ -251,20 +248,15 @@ Guidance configuration tools. %files backends %defattr(-,root,root,-) -%dir %{python_sitearch}/%{name} +%dir %{python_sitelib}/tde-guidance %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} -%{python_sitearch}/%{name}/MicroHAL.py* -%{python_sitearch}/%{name}/xf86misc.py* +%{python_sitelib}/tde-guidance/MicroHAL.py* %if 0%{?rhel} == 7 -%{python_sitearch}/%{name}/__pycache__/MicroHAL.*.pyc -%{python_sitearch}/%{name}/__pycache__/xf86misc.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc %endif %else -%pycached %{python_sitearch}/%{name}/MicroHAL.py -%pycached %{python_sitearch}/%{name}/xf86misc.py +%pycached %{python_sitelib}/tde-guidance/MicroHAL.py %endif -%{python_sitearch}/ixf86misc*.so -%{python_sitearch}/xf86misc*.pyc ########## @@ -292,31 +284,31 @@ suspend using HAL. %defattr(-,root,root,-) %{tde_bindir}/guidance-power-manager %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} -%{python_sitearch}/%{name}/MicroHAL.py* -%{python_sitearch}/%{name}/guidance-power-manager.py* -%{python_sitearch}/%{name}/powermanage.py* -%{python_sitearch}/%{name}/gpmhelper.py* -%{python_sitearch}/%{name}/powermanager_ui.py* -%{python_sitearch}/%{name}/guidance_power_manager_ui.py* -%{python_sitearch}/%{name}/notify.py* -%{python_sitearch}/%{name}/tooltip.py* -%{python_sitearch}/%{name}/__pycache__/MicroHAL.*.pyc -%{python_sitearch}/%{name}/__pycache__/guidance-power-manager.*.pyc -%{python_sitearch}/%{name}/__pycache__/powermanage.*.pyc -%{python_sitearch}/%{name}/__pycache__/gpmhelper.*.pyc -%{python_sitearch}/%{name}/__pycache__/powermanager_ui.*.pyc -%{python_sitearch}/%{name}/__pycache__/guidance_power_manager_ui.*.pyc -%{python_sitearch}/%{name}/__pycache__/notify.*.pyc -%{python_sitearch}/%{name}/__pycache__/tooltip.*.pyc +%{python_sitelib}/tde-guidance/MicroHAL.py* +%{python_sitelib}/tde-guidance/guidance-power-manager.py* +%{python_sitelib}/tde-guidance/powermanage.py* +%{python_sitelib}/tde-guidance/gpmhelper.py* +%{python_sitelib}/tde-guidance/powermanager_ui.py* +%{python_sitelib}/tde-guidance/guidance_power_manager_ui.py* +%{python_sitelib}/tde-guidance/notify.py* +%{python_sitelib}/tde-guidance/tooltip.py* +%{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/guidance-power-manager.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/powermanage.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/gpmhelper.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/powermanager_ui.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/guidance_power_manager_ui.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/notify.*.pyc +%{python_sitelib}/tde-guidance/__pycache__/tooltip.*.pyc %else -%pycached %{python_sitearch}/%{name}/MicroHAL.py -%pycached %{python_sitearch}/%{name}/guidance-power-manager.py -%pycached %{python_sitearch}/%{name}/powermanage.py -%pycached %{python_sitearch}/%{name}/gpmhelper.py -%pycached %{python_sitearch}/%{name}/powermanager_ui.py -%pycached %{python_sitearch}/%{name}/guidance_power_manager_ui.py -%pycached %{python_sitearch}/%{name}/notify.py -%pycached %{python_sitearch}/%{name}/tooltip.py +%pycached %{python_sitelib}/tde-guidance/MicroHAL.py +%pycached %{python_sitelib}/tde-guidance/guidance-power-manager.py +%pycached %{python_sitelib}/tde-guidance/powermanage.py +%pycached %{python_sitelib}/tde-guidance/gpmhelper.py +%pycached %{python_sitelib}/tde-guidance/powermanager_ui.py +%pycached %{python_sitelib}/tde-guidance/guidance_power_manager_ui.py +%pycached %{python_sitelib}/tde-guidance/notify.py +%pycached %{python_sitelib}/tde-guidance/tooltip.py %endif %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png %{tde_datadir}/apps/guidance/pics/ac-adapter.png @@ -347,151 +339,43 @@ suspend using HAL. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -#export PYTHONPATH=%{python_sitearch}/pytqt - -# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia -export PYTHONDONTWRITEBYTECODE= +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -# FTBFS on PCLOS ... export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}" -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" - %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -# FIXME: ordinal not in range in rhel7 -%if 0%{?rhel} == 7 -export LC_ALL=en_US.UTF-8 -%endif - -%__python ./setup.py build +# Warning: GCC visibility causes FTBFS [Bug #1285] +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" \ + .. + +%__make %{?_smp_mflags} || %__make %install -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" -export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" -export SIPTQT_DIR="%{python_sitearch}/sip4_tqt" -export PYTHONPATH="%{python_sitearch}/pytqt" - -# Support for 'sip4-tqt' -export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}" - -# For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled. -export PYTHONDONTWRITEBYTECODE= - -# FIXME: ordinal not in range in rhel7 -%if 0%{?rhel} == 7 -export LC_ALL=en_US.UTF-8 -%endif - -%__rm -rf %{buildroot} -%__python ./setup.py install \ - --prefix=%{tde_prefix} \ - --root=%{buildroot} - -# Fix temporary build directories remaining inside .py files -for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do - %__sed -i "${f}" -e "s|%{buildroot}||g" -done - -##### MAIN PACKAGE INSTALLATION (based on Debian/Ubuntu packaging rules) -# install icons to right place -%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png - -# fix binary-or-shlib-defines-rpath -chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so - -# move python modules in %{python_sitearch} (/usr/lib/pythonXX/site-packages) -%__mkdir_p %{buildroot}%{python_sitearch}/%{name} -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py* %{buildroot}%{python_sitearch}/%{name} - -# Generates the startup scripts -%__rm -f %{buildroot}%{tde_bindir}/* -%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig -%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig -%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig - -# fix script-not-executable -%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py - -##### BACKENDS INSTALLATION - -# The xf86misc stuff should not go under /opt/trinity bur under /usr !!! -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc*.so %{buildroot}%{python_sitearch}/ -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/__pycache__/xf86misc*.pyc %{buildroot}%{python_sitearch}/ -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}/ - -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB -%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB -%endif - -%if 0%{?with_powermanager} -##### POWERMANAGER INSTALLATION -# install icon to right place -%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \ - %{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%__install -D -p -m0644 kde/powermanager/pics/*.png \ - %{buildroot}%{tde_datadir}/apps/guidance/pics/ - -# install desktop file -%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \ - %{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop - -# copy python modules in PYSUPPORT_PATH -%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name} -%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name} -%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name} - -# generate guidance-power-manager script -cat <<EOF >%{?buildroot}%{tde_bindir}/guidance-power-manager -#!/bin/sh -export PYTHONPATH=%{python_sitearch}/%{name}:%{python_sitearch}/sip4-tqt -%{python_sitearch}/%{name}/guidance-power-manager.py & -EOF -chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager - -# fix script-not-executable -chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py -chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py - -%else -%__rm -f %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance-power-manager.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py* -%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/powermanager_ui.ui - -%endif - -# Replace all '#!' calls to python with /usr/bin/python -# and make them executable -for i in `find %{buildroot} -type f`; do - sed '1s,#!.*python[^ ]*\(.*\),#!/usr/bin/env %python\1,' \ - $i > $i.temp; - if cmp --quiet $i $i.temp; then - rm -f $i.temp; - else - mv -f $i.temp $i; - chmod 755 $i; - echo "fixed interpreter: $i"; - fi; -done - -# Removes useless files -find %{buildroot} -name "*.egg-info" -exec rm -f {} \; -find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \; -%__rm -rf %{buildroot}%{tde_libdir}/python*/site-packages/guidance-*.egg-info/ +%__rm -fr $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build %clean diff --git a/redhat/applications/system/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec index ad06072a5..f4279ad39 100644 --- a/redhat/applications/system/kbfx/kbfx.spec +++ b/redhat/applications/system/kbfx/kbfx.spec @@ -228,6 +228,7 @@ export PATH="%{tde_bindir}:${PATH}" %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 +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kbfxconfigapp.mo %{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop diff --git a/redhat/applications/system/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec index 25abd094a..84c5d59ce 100644 --- a/redhat/applications/system/krusader/krusader.spec +++ b/redhat/applications/system/krusader/krusader.spec @@ -169,6 +169,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %{tde_tdeappdir}/krusader.desktop %{tde_tdeappdir}/krusader_root-mode.desktop %{tde_datadir}/apps/krusader +%{tde_datadir}/apps/tdeconf_update/krusader_tqt_selection.upd %{tde_datadir}/icons/crystalsvg/*/apps/*.png %{tde_datadir}/icons/locolor/*/apps/*.png %{tde_datadir}/services/krarc.protocol diff --git a/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec index e5ffdca03..9971dcde6 100644 --- a/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec +++ b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec @@ -145,6 +145,9 @@ fi %{tde_tdelibdir}/twin_iaora_config.so %{tde_datadir}/apps/tdestyle/themes/ia_ora.themerc %{tde_datadir}/apps/twin/iaora.desktop +%{_libdir}/gtk-2.0/2.10.0/engines/libia_ora.la +%{_libdir}/gtk-2.0/2.10.0/engines/libia_ora.so +%{_datadir}/themes/Ia* %changelog diff --git a/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec new file mode 100644 index 000000000..394708490 --- /dev/null +++ b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec @@ -0,0 +1,143 @@ +# +# spec file for package polyester (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.1 +%endif +%define tde_pkg tde-style-polyester +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +# Required for Mageia and PCLinuxOS: removes the ldflag '--no-undefined' +%define _disable_ld_no_undefined 1 + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Domino widget style and twin decoration for TDE +Group: Graphical desktop/TDE +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} +BuildRequires: libjpeg-devel +%else +BuildRequires: jpeg-devel +%endif + +%description +Domino is a style with a soft look. It allows to fine adjust the shininess +of the widgets by customizable color gradients. + + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root) +%{tde_tdelibdir}/plugins/styles/polyester.la +%{tde_tdelibdir}/plugins/styles/polyester.so +%{tde_tdelibdir}/tdestyle_polyester_config.la +%{tde_tdelibdir}/tdestyle_polyester_config.so +%{tde_tdelibdir}/twin_polyester.la +%{tde_tdelibdir}/twin_polyester.so +%{tde_tdelibdir}/twin_polyester_config.la +%{tde_tdelibdir}/twin_polyester_config.so +%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterBlue.kcsrc +%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterEmerald.kcsrc +%{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterOrangeJuice.kcsrc +%{tde_datadir}/apps/tdestyle/themes/polyester.themerc +%{tde_datadir}/apps/twin/polyester.desktop + + +%changelog diff --git a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec new file mode 100644 index 000000000..6986d3f7b --- /dev/null +++ b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec @@ -0,0 +1,158 @@ +# +# spec file for package twin-style-fahrenheit (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.1 +%endif +%define tde_pkg twin-style-fahrenheit +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE window decoration from SUSE 9.3 +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +This is a port of the SUSE 9.3 KDE Window decoration extracted from SUSE. + +It features in additon to the original theme several new button +styles and a changeable titlebar image. + +A color scheme for TDE is provided too. + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%{tde_tdelibdir}/twin_fahrenheit.la +%{tde_tdelibdir}/twin_fahrenheit.so +%{tde_datadir}/apps/twin/fahrenheit.desktop +%{tde_datadir}/apps/twin/fahrenheit/close.png +%{tde_datadir}/apps/twin/fahrenheit/help.png +%{tde_datadir}/apps/twin/fahrenheit/maximize.png +%{tde_datadir}/apps/twin/fahrenheit/minimize.png +%{tde_datadir}/apps/twin/fahrenheit/minmax.png +%{tde_datadir}/apps/twin/fahrenheit/sticky.png +%{tde_datadir}/apps/twin/fahrenheit/unsticky.png + + +%changelog |