diff options
Diffstat (limited to 'redhat/applications')
-rw-r--r-- | redhat/applications/amarok/amarok.spec | 2 | ||||
l--------- | redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh | 2 | ||||
l--------- | redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 | 2 | ||||
l--------- | redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 | 2 | ||||
-rw-r--r-- | redhat/applications/kbookreader/kbookreader.spec | 16 | ||||
-rw-r--r-- | redhat/applications/kdbg/kdbg.spec | 53 | ||||
-rw-r--r-- | redhat/applications/kvpnc/kvpnc.spec | 1 | ||||
-rw-r--r-- | redhat/applications/mathemagics/mathemagics.spec | 4 | ||||
-rw-r--r-- | redhat/applications/tde-guidance/tde-guidance.spec | 1 | ||||
-rw-r--r-- | redhat/applications/tdeio-apt/tdeio-apt.spec | 4 | ||||
-rw-r--r-- | redhat/applications/tdeio-ftps/tdeio-ftps.spec | 4 | ||||
-rw-r--r-- | redhat/applications/tdeio-gopher/tdeio-gopher.spec | 53 | ||||
-rw-r--r-- | redhat/applications/tdeio-sword/tdeio-sword.spec | 6 |
13 files changed, 76 insertions, 74 deletions
diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec index 1a5d0ed81..53eb434b9 100644 --- a/redhat/applications/amarok/amarok.spec +++ b/redhat/applications/amarok/amarok.spec @@ -396,7 +396,7 @@ Requires: trinity-konqueror %defattr(-,root,root,-) %{tde_datadir}/apps/konqueror/servicemenus/*.desktop %{tde_tdelibdir}/konqsidebar_universalamarok.* -%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop +%{tde_datadir}/apps/konqsidebartng/*/amarok_konquisidebar.desktop ########## diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh index 0c82b8b5f..373c65ab3 120000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh @@ -1 +1 @@ -../../../ubuntu/xenial/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file +../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 index f71a6795b..62aa57f04 120000 --- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 +++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 @@ -1 +1 @@ -../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file +../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 index 8e006a46b..2d0ca2867 120000 --- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 +++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 @@ -1 +1 @@ -../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file +../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/kbookreader/kbookreader.spec index 908aa2db7..293e4474a 100644 --- a/redhat/applications/kbookreader/kbookreader.spec +++ b/redhat/applications/kbookreader/kbookreader.spec @@ -144,7 +144,7 @@ export PATH="%{tde_bindir}:${PATH}" # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer +%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbookreader.desktop" Office Viewer %endif %find_lang %{tde_pkg} || touch %{tde_pkg}.lang @@ -157,13 +157,13 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING -%{tde_bindir}/bookreader -%{tde_bindir}/bookreader_client -%{tde_tdeappdir}/bookreader.desktop -%{tde_datadir}/apps/bookreader/ -%{tde_datadir}/config.kcfg/bookreader.kcfg -%{tde_tdedocdir}/HTML/en/bookreader/ -%{tde_datadir}/icons/hicolor/*/apps/bookreader.png +%{tde_bindir}/kbookreader +%{tde_bindir}/kbookreader_client +%{tde_tdeappdir}/kbookreader.desktop +%{tde_datadir}/apps/kbookreader/ +%{tde_datadir}/config.kcfg/kbookreader.kcfg +%{tde_tdedocdir}/HTML/en/kbookreader/ +%{tde_datadir}/icons/hicolor/*/apps/kbookreader.png %changelog diff --git a/redhat/applications/kdbg/kdbg.spec b/redhat/applications/kdbg/kdbg.spec index bec1628a6..7f50e09e3 100644 --- a/redhat/applications/kdbg/kdbg.spec +++ b/redhat/applications/kdbg/kdbg.spec @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake libtool m4 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -113,33 +113,37 @@ Features include the following: %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}" -export kde_confdir="%{tde_confdir}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ +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_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. %__make %{?_smp_mflags} || %__make @@ -147,7 +151,7 @@ export kde_confdir="%{tde_confdir}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -167,6 +171,7 @@ export PATH="%{tde_bindir}:${PATH}" %lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/ %{tde_datadir}/icons/hicolor/*/apps/kdbg.png %{tde_datadir}/icons/locolor/*/apps/kdbg.png +%{tde_mandir}/man1/kdbg.* %changelog diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/kvpnc/kvpnc.spec index b42fe1ab2..1b097a30f 100644 --- a/redhat/applications/kvpnc/kvpnc.spec +++ b/redhat/applications/kvpnc/kvpnc.spec @@ -169,6 +169,7 @@ export PATH="%{_bindir}:${PATH}" %lang(sv) %{tde_datadir}/doc/tde/HTML/sv/kvpnc/ %{tde_datadir}/icons/hicolor/*/apps/kvpnc.png %{tde_datadir}/icons/locolor/*/apps/kvpnc.png +%{tde_docdir}/kvpnc/ %{tde_tdedocdir}/HTML/en/tdeioslave/pcf/ %{tde_datadir}/services/pcf.protocol %{tde_mandir}/man1/*.1* diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/mathemagics/mathemagics.spec index 9c1ae13d8..a770cf090 100644 --- a/redhat/applications/mathemagics/mathemagics.spec +++ b/redhat/applications/mathemagics/mathemagics.spec @@ -107,12 +107,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__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 COPYING README %{tde_bindir}/mathemagics diff --git a/redhat/applications/tde-guidance/tde-guidance.spec b/redhat/applications/tde-guidance/tde-guidance.spec index b7038ef49..9654831e5 100644 --- a/redhat/applications/tde-guidance/tde-guidance.spec +++ b/redhat/applications/tde-guidance/tde-guidance.spec @@ -194,7 +194,6 @@ or can be run as standalone applications. %{tde_datadir}/apps/guidance/ %{tde_tdeappdir}/*.desktop %{tde_datadir}/icons/crystalsvg/*/*/*.png -%{tde_datadir}/icons/crystalsvg/*/*/*.svg %{python_sitearch}/%{name}/SMBShareSelectDialog.py* %{python_sitearch}/%{name}/SimpleCommandRunner.py* %{python_sitearch}/%{name}/fuser.py* diff --git a/redhat/applications/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio-apt/tdeio-apt.spec index 84cba8dd5..346793257 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt.spec @@ -141,14 +141,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang %{tde_pkg} +%find_lang tdeio_apt %clean %__rm -rf %{buildroot} -%files -f %{tde_pkg}.lang +%files -f tdeio_apt.lang %defattr(-,root,root,-) %doc AUTHORS CHANGELOG ChangeLog COPYING %{tde_tdelibdir}/tdeio_apt.la diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio-ftps/tdeio-ftps.spec index f7ba12a15..07ab67ae5 100644 --- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec +++ b/redhat/applications/tdeio-ftps/tdeio-ftps.spec @@ -144,14 +144,14 @@ fi %__rm -rf %{?buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang %{tde_pkg} +%find_lang tdeio_ftps %clean %__rm -rf %{?buildroot} -%files -f %{tde_pkg}.lang +%files -f tdeio_ftps.lang %defattr(-,root,root,-) %defattr(-,root,root,-) %doc README Changelog COPYING AUTHORS diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio-gopher/tdeio-gopher.spec index 3c494a94c..74f8bbd48 100644 --- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec +++ b/redhat/applications/tdeio-gopher/tdeio-gopher.spec @@ -72,9 +72,6 @@ BuildRequires: libacl-devel # IDN support BuildRequires: libidn-devel -# OPENSSL support -BuildRequires: openssl-devel - # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -85,9 +82,6 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -Obsoletes: trinity-kio-gopher < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-kio-gopher = %{?epoch:%{epoch}:}%{version}-%{release} - %description Adds support for the "gopher:" protocol @@ -146,40 +140,41 @@ fi %__rm -rf %{?buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang %{tde_pkg} +%find_lang tdeio_gopher %clean %__rm -rf %{?buildroot} -%files -f %{tde_pkg}.lang +%files -f tdeio_gopher.lang %defattr(-,root,root,-) %doc ChangeLog COPYING FAQ README VERSION %{tde_tdelibdir}/tdeio_gopher.la %{tde_tdelibdir}/tdeio_gopher.so %{tde_datadir}/services/gopher.protocol -%lang(ca) %{tde_tdedocdir}/HTML/ca/tdeio-gopher/ -%lang(da) %{tde_tdedocdir}/HTML/da/tdeio-gopher/ -%lang(de) %{tde_tdedocdir}/HTML/de/tdeio-gopher/ -%lang(en) %{tde_tdedocdir}/HTML/en/tdeioslave/gopher/ -%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/tdeio-gopher/ -%lang(es) %{tde_tdedocdir}/HTML/es/tdeio-gopher/ -%lang(et) %{tde_tdedocdir}/HTML/et/tdeio-gopher/ -%lang(fr) %{tde_tdedocdir}/HTML/fr/tdeio-gopher/ -%lang(gl) %{tde_tdedocdir}/HTML/gl/tdeio-gopher/ -%lang(hu) %{tde_tdedocdir}/HTML/hu/tdeio-gopher/ -%lang(it) %{tde_tdedocdir}/HTML/it/tdeio-gopher/ -%lang(nl) %{tde_tdedocdir}/HTML/nl/tdeio-gopher/ -%lang(pl) %{tde_tdedocdir}/HTML/pl/tdeio-gopher/ -%lang(pt) %{tde_tdedocdir}/HTML/pt/tdeio-gopher/ -%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/tdeio-gopher/ -%lang(ro) %{tde_tdedocdir}/HTML/ro/tdeio-gopher/ -%lang(ru) %{tde_tdedocdir}/HTML/ru/tdeio-gopher/ -%lang(sr) %{tde_tdedocdir}/HTML/sr/tdeio-gopher/ -%lang(sr@Latn) %{tde_tdedocdir}/HTML/sr@Latn/tdeio-gopher/ -%lang(sv) %{tde_tdedocdir}/HTML/sv/tdeio-gopher/ -%lang(uk) %{tde_tdedocdir}/HTML/uk/tdeio-gopher/ +%lang(ca) %{tde_tdedocdir}/HTML/ca/tdeioslave/ +%lang(da) %{tde_tdedocdir}/HTML/da/tdeioslave/ +%lang(de) %{tde_tdedocdir}/HTML/de/tdeioslave/ +%lang(en) %{tde_tdedocdir}/HTML/en/tdeioslave/ +%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/tdeioslave/ +%lang(es) %{tde_tdedocdir}/HTML/es/tdeioslave/ +%lang(et) %{tde_tdedocdir}/HTML/et/tdeioslave/ +%lang(fr) %{tde_tdedocdir}/HTML/fr/tdeioslave/ +%lang(gl) %{tde_tdedocdir}/HTML/gl/tdeioslave/ +%lang(hu) %{tde_tdedocdir}/HTML/hu/tdeioslave/ +%lang(it) %{tde_tdedocdir}/HTML/it/tdeioslave/ +%lang(nl) %{tde_tdedocdir}/HTML/nl/tdeioslave/ +%lang(pl) %{tde_tdedocdir}/HTML/pl/tdeioslave/ +%lang(pt) %{tde_tdedocdir}/HTML/pt/tdeioslave/ +%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/tdeioslave/ +%lang(ro) %{tde_tdedocdir}/HTML/ro/tdeioslave/ +%lang(ru) %{tde_tdedocdir}/HTML/ru/tdeioslave/ +%lang(sk) %{tde_tdedocdir}/HTML/sk/tdeioslave/ +%lang(sr) %{tde_tdedocdir}/HTML/sr/tdeioslave/ +%lang(sr@Latn) %{tde_tdedocdir}/HTML/sr@Latn/tdeioslave/ +%lang(sv) %{tde_tdedocdir}/HTML/sv/tdeioslave/ +%lang(uk) %{tde_tdedocdir}/HTML/uk/tdeioslave/ %changelog diff --git a/redhat/applications/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio-sword/tdeio-sword.spec index 95c53878a..afe995575 100644 --- a/redhat/applications/tdeio-sword/tdeio-sword.spec +++ b/redhat/applications/tdeio-sword/tdeio-sword.spec @@ -154,20 +154,20 @@ fi %__rm -rf %{?buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang %{tde_pkg} +%find_lang tdeio_sword %clean %__rm -rf %{?buildroot} -%files -f %{tde_pkg}.lang +%files -f tdeio_sword.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{tde_tdelibdir}/tdeio_sword.la %{tde_tdelibdir}/tdeio_sword.so %{tde_datadir}/apps/tdeio_sword/ -%{tde_tdedocdir}/HTML/en/tdeio_sword/ +%{tde_tdedocdir}/HTML/en/tdeioslave/sword/ %{tde_datadir}/icons/hicolor/*/apps/tdeio_sword.png %{tde_datadir}/icons/hicolor/scalable/apps/tdeio_sword.svgz %{tde_datadir}/services/sword.protocol |