diff options
31 files changed, 181 insertions, 121 deletions
diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/abakus/abakus.spec index 71221b2bc..bb53dd562 100644 --- a/redhat/applications/abakus/abakus.spec +++ b/redhat/applications/abakus/abakus.spec @@ -28,6 +28,7 @@ %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 @@ -151,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/abakus/ %{tde_datadir}/icons/hicolor/*/apps/abakus.png %{tde_tdedocdir}/HTML/en/abakus/ -%{tde_datadir}/applnk/Utilities/abakus.desktop +%{tde_tdeappdir}/abakus.desktop %changelog diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec index 95d8f58fd..2ac8a4c8d 100644 --- a/redhat/applications/amarok/amarok.spec +++ b/redhat/applications/amarok/amarok.spec @@ -133,6 +133,9 @@ BuildRequires: dbus-qt BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 %endif +# DAAP support +%define with_daap 0 + # IFP support # IFP package is broken under PCLinuxOS. %if 0%{?pclinuxos} == 0 @@ -290,13 +293,18 @@ Amarok is a multimedia player with: %{tde_datadir}/services/amarokitpc.protocol %{tde_datadir}/services/amaroklastfm.protocol %{tde_datadir}/services/amarokpcast.protocol +%{tde_mandir}/man1/amarok.1* +%{tde_mandir}/man1/amarokapp.1* +%{tde_mandir}/man1/amarokcollectionscanner.1* # -libs ? -- Rex %{tde_libdir}/libamarok.so.0 %{tde_libdir}/libamarok.so.0.0.0 # DAAP +%if 0%{?with_daap} %{tde_bindir}/amarok_daapserver.rb %{tde_tdelibdir}/libamarok_daap-mediadevice.* %{tde_datadir}/services/amarok_daap-mediadevice.desktop +%endif # Mass-storage %{tde_datadir}/services/amarok_massstorage-device.desktop %{tde_tdelibdir}/libamarok_massstorage-device.* @@ -358,22 +366,6 @@ Amarok is a multimedia player with: ########## -%package ruby -Summary: %{name} Ruby support -Group: Applications/Multimedia -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -# For dir ownership and some default plugins (lyrics) -Requires: ruby - -%description ruby -%{summary}. - -%files ruby -%defattr(-,root,root,-) -%{tde_libdir}/ruby_lib/ - -########## - %package konqueror Summary: Amarok konqueror (service menus, sidebar) support Group: Applications/Multimedia @@ -410,6 +402,7 @@ use any of xmms' visualisation plugins with Amarok. %files visualisation %defattr(-,root,root,-) %{tde_bindir}/amarok_libvisual +%{tde_mandir}/man1/amarok_libvisual.1* %endif @@ -432,8 +425,13 @@ if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )" fi %if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 -%__sed -i "amarok/src/scripts/playlist2html/playlist2html.py" \ +%__sed -i "amarok/src/scripts/common/Publisher.py" \ + "amarok/src/scripts/common/Zeroconf.py" \ + "amarok/src/scripts/playlist2html/Playlist.py" \ + "amarok/src/scripts/playlist2html/playlist2html.py" \ "amarok/src/scripts/playlist2html/PlaylistServer.py" \ + "amarok/src/scripts/webcontrol/Playlist.py" \ + "amarok/src/scripts/webcontrol/RequestHandler.py" \ "amarok/src/scripts/webcontrol/WebControl.py" \ -e "s|/usr/bin/env python|/usr/bin/env python2|" %endif @@ -481,9 +479,10 @@ fi %{?with_njb:-DWITH_NJB=ON} \ %{?with_mtp:-DWITH_MTP=ON} \ %{?with_karma:-DWITH_RIOKARMA=ON} \ - -DWITH_DAAP=ON \ + %{!?with_daap:-DWITH_DAAP=OFF} \ %{?with_mp4v2:-DWITH_MP4V2=ON} \ %{?with_inotify:-DWITH_INOTIFY=ON} \ + -DWITH_SYSTEM_SQLITE=ON \ -DBUILD_ALL=ON \ .. diff --git a/redhat/applications/kbfx/kbfx.spec b/redhat/applications/kbfx/kbfx.spec index 73337676d..2ee02caba 100644 --- a/redhat/applications/kbfx/kbfx.spec +++ b/redhat/applications/kbfx/kbfx.spec @@ -222,6 +222,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/hicolor/*/apps/kbfx.png %{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png %lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/kbfxconfigapp.mo +%lang(de) %{tde_datadir}/locale/de/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 diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/kbiff/kbiff.spec index c2470dc42..41af42e65 100644 --- a/redhat/applications/kbiff/kbiff.spec +++ b/redhat/applications/kbiff/kbiff.spec @@ -147,10 +147,6 @@ fi %find_lang %{tde_pkg} -# Fix icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Internet/kbiff.desktop" "%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" - # Updates applications categories for openSUSE %if 0%{?suse_version} echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/kbookreader/kbookreader.spec index 913d92174..e688032b4 100644 --- a/redhat/applications/kbookreader/kbookreader.spec +++ b/redhat/applications/kbookreader/kbookreader.spec @@ -142,10 +142,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# Fix desktop icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Office/bookreader.desktop" "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" - # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/kcmldapmanager/kcmldapmanager.spec index a43701a3c..7cc07b3da 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager.spec @@ -139,7 +139,7 @@ Group: Applications/Utilities %description -n trinity-kcontrol-ldap-manager This is a TDE control center module to manage users, groups, and machines in Kerberos realms. -%files -n trinity-kcontrol-ldap-manager +%files -n trinity-kcontrol-ldap-manager -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING %{tde_bindir}/tdeldapmanager @@ -200,6 +200,8 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} || touch %{tde_pkg}.lang + %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/kcpuload/kcpuload.spec index d38734cff..2a15211f7 100644 --- a/redhat/applications/kcpuload/kcpuload.spec +++ b/redhat/applications/kcpuload/kcpuload.spec @@ -144,9 +144,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# Fix desktop icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/System/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" +%find_lang %{tde_pkg} || touch %{tde_pkg}.lang # Fix desktop files (openSUSE only) echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" @@ -159,7 +157,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/kcpuload %{tde_tdeappdir}/kcpuload.desktop diff --git a/redhat/applications/kdirstat/kdirstat.spec b/redhat/applications/kdirstat/kdirstat.spec index c2f2ce80c..d85822456 100644 --- a/redhat/applications/kdirstat/kdirstat.spec +++ b/redhat/applications/kdirstat/kdirstat.spec @@ -151,10 +151,6 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} -# Fix desktop file location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/kdirstat.desktop" "%{?buildroot}%{tde_tdeappdir}" - # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" kdirstat Filesystem diff --git a/redhat/applications/kerberostray/kerberostray.spec b/redhat/applications/kerberostray/kerberostray.spec index 043d884d1..ca3fb28ae 100644 --- a/redhat/applications/kerberostray/kerberostray.spec +++ b/redhat/applications/kerberostray/kerberostray.spec @@ -179,6 +179,8 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + # Apps that should stay in TDE echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" @@ -187,7 +189,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %{tde_bindir}/kerberostray %{tde_tdeappdir}/kerberostray.desktop %{tde_datadir}/apps/kerberostray/ diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/klcddimmer/klcddimmer.spec index 5ae7ddc9b..fa58ea1bc 100644 --- a/redhat/applications/klcddimmer/klcddimmer.spec +++ b/redhat/applications/klcddimmer/klcddimmer.spec @@ -148,8 +148,8 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING LICENSE NEWS README -%{tde_libdir}/libklcddimmer_panelapplet.la -%{tde_libdir}/libklcddimmer_panelapplet.so +%{tde_libdir}/klcddimmer_panelapplet.la +%{tde_libdir}/klcddimmer_panelapplet.so %{tde_datadir}/apps/kicker/applets/klcddimmer.desktop %{tde_tdedocdir}/HTML/en/klcddimmer/ %{tde_datadir}/icons/hicolor/*/apps/klcddimmer.png diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/knmap/knmap.spec index 03145ddd5..30274d2bc 100644 --- a/redhat/applications/knmap/knmap.spec +++ b/redhat/applications/knmap/knmap.spec @@ -156,6 +156,8 @@ fi %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build +%find_lang %{tde_pkg} + # Move desktop icon to XDG directory %__mkdir_p %{buildroot}%{tde_tdeappdir} %__mv "%{buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" @@ -171,7 +173,7 @@ fi %__rm -rf $RPM_BUILD_ROOT -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog %{tde_bindir}/knmap diff --git a/redhat/applications/knutclient/knutclient.spec b/redhat/applications/knutclient/knutclient.spec index e9dd116cb..7fe001aba 100644 --- a/redhat/applications/knutclient/knutclient.spec +++ b/redhat/applications/knutclient/knutclient.spec @@ -106,7 +106,7 @@ stations using an UPS. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} # Fix permissions -chmod 644 AUTHORS README TODO COPYING ChangeLog +chmod 644 AUTHORS README COPYING ChangeLog %build diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/kpicosim/kpicosim.spec index 3f05e92af..fe2aa1881 100644 --- a/redhat/applications/kpicosim/kpicosim.spec +++ b/redhat/applications/kpicosim/kpicosim.spec @@ -137,14 +137,16 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS ChangeLog COPYING README %{tde_bindir}/kpicosim %{tde_datadir}/applnk/Development/kpicosim.desktop %{tde_datadir}/apps/katepart/syntax/psm.xml diff --git a/redhat/applications/ksensors/ksensors.spec b/redhat/applications/ksensors/ksensors.spec index fdfc3faea..bbd920338 100644 --- a/redhat/applications/ksensors/ksensors.spec +++ b/redhat/applications/ksensors/ksensors.spec @@ -149,10 +149,6 @@ fi %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build -# Move desktop icon to correct location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" - %find_lang %{tde_pkg} # Updates applications categories for openSUSE @@ -168,9 +164,6 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING FAQ README TODO -%lang(es) %doc LEEME -%lang(de) %doc LIESMICH -%lang(fr) %doc LISEZMOI %{tde_bindir}/ksensors %{tde_tdeappdir}/ksensors.desktop %{tde_datadir}/apps/ksensors/ diff --git a/redhat/applications/ksystemlog/ksystemlog.spec b/redhat/applications/ksystemlog/ksystemlog.spec index c2f3f580d..8a27afe07 100644 --- a/redhat/applications/ksystemlog/ksystemlog.spec +++ b/redhat/applications/ksystemlog/ksystemlog.spec @@ -131,10 +131,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -# Move desktop file to XDG folder -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" - # Missing category will make this fail. echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" diff --git a/redhat/applications/kvkbd/kvkbd.spec b/redhat/applications/kvkbd/kvkbd.spec index 89753f0a9..520200e9c 100644 --- a/redhat/applications/kvkbd/kvkbd.spec +++ b/redhat/applications/kvkbd/kvkbd.spec @@ -143,9 +143,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# Move desktop file to XDG location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" +%find_lang %{tde_pkg} # Updates applications categories for openSUSE %if 0%{?suse_version} @@ -157,9 +155,9 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS COPYING README %{tde_bindir}/kvkbd %{tde_tdeappdir}/kvkbd.desktop %{tde_datadir}/apps/kvkbd/ diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/mplayerthumbs/mplayerthumbs.spec index 6a932316b..1efbb1762 100644 --- a/redhat/applications/mplayerthumbs/mplayerthumbs.spec +++ b/redhat/applications/mplayerthumbs/mplayerthumbs.spec @@ -147,12 +147,14 @@ fi %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + %clean %__rm -rf $RPM_BUILD_ROOT -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{tde_bindir}/mplayerthumbsconfig diff --git a/redhat/applications/potracegui/potracegui.spec b/redhat/applications/potracegui/potracegui.spec index 083f43f67..252be6cbb 100644 --- a/redhat/applications/potracegui/potracegui.spec +++ b/redhat/applications/potracegui/potracegui.spec @@ -144,9 +144,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# Move desktop file to XDG location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" +%find_lang %{tde_pkg} # Updates applications categories for openSUSE %if 0%{?suse_version} @@ -158,16 +156,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING README %{tde_bindir}/potracegui %{tde_tdeappdir}/potracegui.desktop %{tde_datadir}/apps/potracegui/ %{tde_tdedocdir}/HTML/en/potracegui/ -%{tde_datadir}/icons/hicolor/16x16/apps/potracegui.png -%{tde_datadir}/icons/hicolor/32x32/apps/potracegui.png -%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/potracegui.mo +%{tde_datadir}/icons/hicolor/*/apps/potracegui.png %{tde_mandir}/man1/*.1* diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec index a41633ed4..3437fd121 100644 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec +++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec @@ -145,13 +145,15 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_tdelibdir}/tdestyle_lipstik_config.la diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/tde-systemsettings/tde-systemsettings.spec index 98f92e826..643b176aa 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings.spec @@ -153,12 +153,19 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcm_knetworkconfmodule_s echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/medianotifications.desktop" echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop" +# Fix translation names +for d in "%{buildroot}%{tde_datadir}/locale/"*"/LC_MESSAGES"; do + mv "${d}/"*".mo" "${d}/%{tde_pkg}.mo" +done + +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc README TODO %dir %{tde_sysconfdir}/xdg diff --git a/redhat/applications/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio-apt/tdeio-apt.spec index 041304b19..ae1fdc218 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt.spec @@ -60,11 +60,17 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -97,39 +103,43 @@ browsing the packages easier. It provides: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/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} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +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} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_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 \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio-ftps/tdeio-ftps.spec index 3fad6f963..e9be49b8d 100644 --- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec +++ b/redhat/applications/tdeio-ftps/tdeio-ftps.spec @@ -144,8 +144,15 @@ fi %__rm -rf %{?buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} -%files + +%clean +%__rm -rf %{?buildroot} + + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) %defattr(-,root,root,-) %doc README Changelog COPYING AUTHORS %{tde_tdelibdir}/tdeio_ftps.la diff --git a/redhat/applications/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio-sword/tdeio-sword.spec index bd78c8efa..1c35ccbec 100644 --- a/redhat/applications/tdeio-sword/tdeio-sword.spec +++ b/redhat/applications/tdeio-sword/tdeio-sword.spec @@ -154,8 +154,14 @@ fi %__rm -rf %{?buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} -%files + +%clean +%__rm -rf %{?buildroot} + + +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{tde_tdelibdir}/tdeio_sword.la diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec index 2167ad3ea..b70f78192 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec @@ -150,10 +150,13 @@ export PATH="%{tde_bindir}:${PATH}" %__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper %__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper +%find_lang tdeio_umountwrapper + %clean %__rm -rf %{buildroot} + %post for f in konqueror d3lphin; do update-alternatives --install \ @@ -163,6 +166,7 @@ for f in konqueror d3lphin; do 20 done + %postun if [ $1 -eq 0 ]; then for f in konqueror d3lphin; do @@ -172,7 +176,8 @@ if [ $1 -eq 0 ]; then done fi -%files + +%files -f tdeio_umountwrapper.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{tde_bindir}/tdeio_umountwrapper diff --git a/redhat/applications/tdmtheme/tdmtheme.spec b/redhat/applications/tdmtheme/tdmtheme.spec index 512eaef43..a3ea2a7ae 100644 --- a/redhat/applications/tdmtheme/tdmtheme.spec +++ b/redhat/applications/tdmtheme/tdmtheme.spec @@ -144,12 +144,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_tdelibdir}/kcm_tdmtheme.la %{tde_tdelibdir}/kcm_tdmtheme.so diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec index 0ea095f6a..316db8d06 100644 --- a/redhat/dependencies/tqca/tqca.spec +++ b/redhat/dependencies/tqca/tqca.spec @@ -56,6 +56,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: trinity-tqca-rpmlintrc BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 +BuildRequires: cmake BuildRequires: gcc-c++ %description @@ -98,9 +99,8 @@ application! %files -n %{libtqca}1 %defattr(-,root,root,-) %doc COPYING README TODO -%{_libdir}/libqca.so.1 -%{_libdir}/libqca.so.1.0 -%{_libdir}/libqca.so.1.0.0 +%{_libdir}/libtqca.so.1 +%{_libdir}/libtqca.so.1.0.0 ########## @@ -124,8 +124,11 @@ This packages contains the development files for TQCA %files -n %{libtqca}-devel %defattr(-,root,root,-) -%{_includedir}/qca.h -%{_libdir}/libqca.so +%{_includedir}/tqt3/tqca.h +%{_includedir}/tqt3/tqcaprovider.h +%{_libdir}/libtqca.la +%{_libdir}/libtqca.so +%{_libdir}/pkgconfig/tqca.pc ########## @@ -145,23 +148,31 @@ perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra %build unset QTDIR QTINC QTLIB -./configure \ - --prefix=%{_prefix} \ - --tqtdir=/usr \ - --debug +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} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + \ + -DWITH_ALL_OPTIONS="ON" \ + .. -# Workaround strange tqmake behaviour in RHEL5 -%if 0%{?rhel} == 5 -%__sed -i "Makefile" -e "s|..\/..\/..\/..|%{_prefix}|g" -%endif - -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install %__rm -rf $RPM_BUILD_ROOT -%__make install INSTALL_ROOT="${RPM_BUILD_ROOT}/" +%__make install DESTDIR=%{?buildroot} -C build %clean diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index 2095a743d..b95b83894 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -1304,6 +1304,7 @@ plugdev group. %{tde_datadir}/applnk/Settings/WebBrowsing/smb.desktop %{tde_datadir}/apps/kcm_componentchooser/kcm_browser.desktop %{tde_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop +%{tde_datadir}/apps/kcm_componentchooser/kcm_filemanager.desktop %{tde_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop %{tde_datadir}/apps/kcmview1394/ %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop @@ -1637,6 +1638,7 @@ needed for a basic TDE desktop installation. %{tde_datadir}/icons/crystalsvg/*/apps/penguin.png %{tde_datadir}/icons/crystalsvg/*/categories/preferences-desktop-personal.png %{tde_datadir}/icons/crystalsvg/*/apps/phppg.png +%{tde_datadir}/icons/crystalsvg/*/apps/package_games_logic.png %{tde_datadir}/icons/crystalsvg/*/apps/proxy.png %{tde_datadir}/icons/crystalsvg/*/apps/pysol.png %{tde_datadir}/icons/crystalsvg/*/apps/randr.png @@ -2107,6 +2109,7 @@ Installation of smbclient will make you able to use smb shared printers. %{tde_datadir}/apps/tdeprintfax/ %{tde_datadir}/apps/kjobviewer/ %{tde_datadir}/apps/tdeprint_part/ +%{tde_datadir}/autostart/kjobviewer-autostart.desktop %{tde_datadir}/icons/hicolor/*/apps/tdeprintfax.png %{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png %{tde_datadir}/icons/hicolor/*/apps/printmgr.png @@ -2149,7 +2152,6 @@ the TDE desktop. %config(noreplace) %{tde_confdir}/kdesktop_custom_menu1 %config(noreplace) %{tde_confdir}/kdesktop_custom_menu2 %{tde_bindir}/kcheckrunning -%{tde_bindir}/kxdglauncher %{tde_bindir}/tdeeject %{tde_bindir}/kdesktop %{tde_bindir}/kdesktop_lock @@ -2770,7 +2772,6 @@ ever launching another application. %{tde_datadir}/apps/konqueror/pics/indicator_viewactive.png %{tde_datadir}/apps/konqueror/profiles/ %exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop -%exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop %{tde_datadir}/apps/konqueror/servicemenus/*.desktop %ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop @@ -2869,6 +2870,7 @@ Using Konsole, a user can open: %files -n trinity-konsole %defattr(-,root,root,-) %{tde_bindir}/konsole +%{tde_bindir}/terminalhere %{tde_tdelibdir}/kcm_konsole.la %{tde_tdelibdir}/kcm_konsole.so %{tde_tdelibdir}/kded_kwrited.la @@ -2884,7 +2886,6 @@ Using Konsole, a user can open: %{tde_datadir}/applnk/.hidden/kcmkonsole.desktop %{tde_datadir}/apps/tdeconf_update/konsole.upd %{tde_datadir}/apps/tdeconf_update/schemaStrip.pl -%{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop %{tde_datadir}/apps/konsole/ %{tde_datadir}/icons/hicolor/*/apps/konsole.* %{tde_datadir}/mimelnk/application/x-konsole.desktop diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec index b1198f509..81b17e82c 100644 --- a/redhat/main/tdeedu/tdeedu.spec +++ b/redhat/main/tdeedu/tdeedu.spec @@ -100,7 +100,7 @@ BuildRequires: libusb-devel # PYTHON support %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 %define python python3 -%define __python %__python2 +%define __python %__python3 %else %define python python %endif @@ -109,6 +109,11 @@ BuildRequires: %{python}-devel # BOOST support BuildRequires: boost-devel +%if 0%{?suse_version} +BuildRequires: libboost_%{python}-devel +%else +BuildRequires: boost-%{python}-devel +%endif # OCAML support %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec index c7685d9cb..d57163534 100644 --- a/redhat/main/tdegames/tdegames.spec +++ b/redhat/main/tdegames/tdegames.spec @@ -71,6 +71,20 @@ BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: libtool +# AVAHI support +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define with_avahi 1 +BuildRequires: libavahi-tqt-devel >= 1:0.6.30 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}avahi-client-devel +Requires: %{_lib}avahi-client3 +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +BuildRequires: avahi-devel +Requires: avahi +%endif +%endif + # IDN support BuildRequires: libidn-devel diff --git a/redhat/main/tdegraphics/tdegraphics.spec b/redhat/main/tdegraphics/tdegraphics.spec index abef4ab03..40258b2f9 100644 --- a/redhat/main/tdegraphics/tdegraphics.spec +++ b/redhat/main/tdegraphics/tdegraphics.spec @@ -237,7 +237,7 @@ BuildRequires: openssl-devel %if 0%{?build_kmrml} #Requires: gift %else -Obsoletes: trinity-kmrml +Obsoletes: trinity-kmrml < %{version}-%{release} %endif Obsoletes: trinity-kdegraphics < %{version}-%{release} @@ -313,10 +313,6 @@ to allow access to your camera's pictures with the URL camera:/ %{tde_tdelibdir}/tdeio_kamera.la %{tde_tdelibdir}/tdeio_kamera.so %{tde_tdeappdir}/kamera.desktop -%{tde_datadir}/icons/crystalsvg/*/actions/camera_test.png -%{tde_datadir}/icons/crystalsvg/*/apps/camera-photo.png -%{tde_datadir}/icons/crystalsvg/*/devices/camera-photo.png -%{tde_datadir}/icons/crystalsvg/*/places/camera-photo.png %{tde_datadir}/services/camera.protocol %{tde_tdedocdir}/HTML/en/kamera/ %{tde_tdedocdir}/HTML/en/tdeioslave/camera/ diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec index afbcd44d4..45323afe3 100644 --- a/redhat/main/tdenetwork/tdenetwork.spec +++ b/redhat/main/tdenetwork/tdenetwork.spec @@ -98,6 +98,20 @@ BuildRequires: brp-check-trinity PreReq: permissions %endif +# AVAHI support +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define with_avahi 1 +BuildRequires: libavahi-tqt-devel >= 1:0.6.30 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}avahi-client-devel +Requires: %{_lib}avahi-client3 +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +BuildRequires: avahi-devel +Requires: avahi +%endif +%endif + # OPENSSL support BuildRequires: openssl-devel |