summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2020-09-06 19:27:42 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2020-09-07 21:02:08 +0200
commit424e58e3209c8ce130983d7d38d4c1ad535d2dbc (patch)
treec3257e85dfcd1c8b9bd9a5c3d412c113a0e5c9a2 /redhat
parentead24dc5421b41a04a0c33dcd2a8e2e733cccc3c (diff)
downloadtde-packaging-424e58e3209c8ce130983d7d38d4c1ad535d2dbc.tar.gz
tde-packaging-424e58e3209c8ce130983d7d38d4c1ad535d2dbc.zip
RPM: update desktop and lang files location
Diffstat (limited to 'redhat')
-rw-r--r--redhat/applications/kchmviewer/kchmviewer.spec7
-rw-r--r--redhat/applications/kkbswitch/kkbswitch.spec7
-rw-r--r--redhat/applications/knights/knights.spec9
-rw-r--r--redhat/applications/knmap/knmap.spec8
-rw-r--r--redhat/applications/knutclient/knutclient.spec9
-rw-r--r--redhat/applications/kpicosim/kpicosim.spec9
-rw-r--r--redhat/applications/kshutdown/kshutdown.spec1
-rw-r--r--redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec4
-rw-r--r--redhat/applications/ksystemlog/ksystemlog.spec4
-rw-r--r--redhat/applications/tde-systemsettings/tde-systemsettings.spec3
-rw-r--r--redhat/dependencies/tqt3/tqt3.spec15
-rw-r--r--redhat/main/tdegames/tdegames.spec1
-rw-r--r--redhat/main/tdeutils/tdeutils.spec6
-rw-r--r--redhat/main/tdewebdev/tdewebdev.spec4
14 files changed, 64 insertions, 23 deletions
diff --git a/redhat/applications/kchmviewer/kchmviewer.spec b/redhat/applications/kchmviewer/kchmviewer.spec
index 68e7c71d7..693ec8e67 100644
--- a/redhat/applications/kchmviewer/kchmviewer.spec
+++ b/redhat/applications/kchmviewer/kchmviewer.spec
@@ -173,8 +173,11 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -f %{?buildroot}%{tde_libdir}/*.a
# Fix desktop icon location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/kchmviewer.desktop" "%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
+if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
+ %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+ %__mv -f "%{?buildroot}%{tde_datadir}/applnk/kchmviewer.desktop" "%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
+ %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
# Updates applications categories for openSUSE
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/kkbswitch/kkbswitch.spec
index c6d7513ec..6a93d0aed 100644
--- a/redhat/applications/kkbswitch/kkbswitch.spec
+++ b/redhat/applications/kkbswitch/kkbswitch.spec
@@ -156,8 +156,11 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
# Fix desktop icon location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
+if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
+ %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+ %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
+ %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
# Updates applications categories for openSUSE
%if 0%{?suse_version}
diff --git a/redhat/applications/knights/knights.spec b/redhat/applications/knights/knights.spec
index 9bde2f66b..ad7bf843e 100644
--- a/redhat/applications/knights/knights.spec
+++ b/redhat/applications/knights/knights.spec
@@ -157,6 +157,13 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+# Fix desktop icon location
+if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
+ %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+ %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Games/Board/knights.desktop" "%{?buildroot}%{tde_tdeappdir}"
+ %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
+
%clean
%__rm -rf %{buildroot}
@@ -165,7 +172,7 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_bindir}/knights
-%{tde_datadir}/applnk/Games/Board/knights.desktop
+%{tde_tdeappdir}/knights.desktop
%{tde_datadir}/apps/knights
%{tde_tdedocdir}/HTML/*/knights
%{tde_datadir}/icons/hicolor/*/*/*.png
diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/knmap/knmap.spec
index 30274d2bc..81528820d 100644
--- a/redhat/applications/knmap/knmap.spec
+++ b/redhat/applications/knmap/knmap.spec
@@ -159,9 +159,11 @@ fi
%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"
-%__rm -r "%{buildroot}%{tde_datadir}/applnk"
+if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then
+ %__mkdir_p %{buildroot}%{tde_tdeappdir}
+ %__mv "%{buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+ %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
# Updates applications categories for openSUSE
%if 0%{?suse_version}
diff --git a/redhat/applications/knutclient/knutclient.spec b/redhat/applications/knutclient/knutclient.spec
index 7fe001aba..7c6b03804 100644
--- a/redhat/applications/knutclient/knutclient.spec
+++ b/redhat/applications/knutclient/knutclient.spec
@@ -150,6 +150,13 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+# Move desktop icon to XDG directory
+if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then
+ %__mkdir_p %{buildroot}%{tde_tdeappdir}
+ %__mv "%{buildroot}%{tde_datadir}/applnk/Utilities/knutclient.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+ %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
+
# Links duplicate files
%fdupes "%{?buildroot}%{tde_datadir}"
@@ -162,7 +169,7 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{tde_bindir}/knutclient
-%{tde_datadir}/applnk/Utilities/knutclient.desktop
+%{tde_tdeappdir}/knutclient.desktop
%{tde_datadir}/apps/knutclient/knutclientui.rc
%{tde_datadir}/apps/knutclient
%{tde_tdedocdir}/HTML/cs/knutclient
diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/kpicosim/kpicosim.spec
index fe2aa1881..5f67d98d5 100644
--- a/redhat/applications/kpicosim/kpicosim.spec
+++ b/redhat/applications/kpicosim/kpicosim.spec
@@ -139,6 +139,13 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
+# Move desktop icon to XDG directory
+if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then
+ %__mkdir_p %{buildroot}%{tde_tdeappdir}
+ %__mv "%{buildroot}%{tde_datadir}/applnk/Development/kpicosim.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+ %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
+
%clean
%__rm -rf %{buildroot}
@@ -148,7 +155,7 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{tde_bindir}/kpicosim
-%{tde_datadir}/applnk/Development/kpicosim.desktop
+%{tde_tdeappdir}/kpicosim.desktop
%{tde_datadir}/apps/katepart/syntax/psm.xml
%{tde_datadir}/apps/kpicosim
%{tde_tdedocdir}/HTML/en/kpicosim
diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/kshutdown/kshutdown.spec
index 3c10b2da0..a11d42ec3 100644
--- a/redhat/applications/kshutdown/kshutdown.spec
+++ b/redhat/applications/kshutdown/kshutdown.spec
@@ -167,6 +167,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/kshutdown.des
%{tde_bindir}/kshutdown
%{tde_tdelibdir}/kshutdownlockout_panelapplet.la
%{tde_tdelibdir}/kshutdownlockout_panelapplet.so
+%{tde_tdeappdir}/kshutdown.desktop
%{tde_datadir}/applications/kshutdown.desktop
%{tde_datadir}/apps/kicker/applets/kshutdownlockout.desktop
%{tde_datadir}/apps/kshutdown/
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec
index ad8371702..e0d7cb511 100644
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec
+++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec
@@ -153,12 +153,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}/ksplashmoodin.la
%{tde_tdelibdir}/ksplashmoodin.so
diff --git a/redhat/applications/ksystemlog/ksystemlog.spec b/redhat/applications/ksystemlog/ksystemlog.spec
index 8a27afe07..fd3dfbd87 100644
--- a/redhat/applications/ksystemlog/ksystemlog.spec
+++ b/redhat/applications/ksystemlog/ksystemlog.spec
@@ -134,12 +134,14 @@ export PATH="%{tde_bindir}:${PATH}"
# Missing category will make this fail.
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
-%files
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{tde_bindir}/ksystemlog
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/tde-systemsettings/tde-systemsettings.spec
index 643b176aa..ec922d786 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings.spec
@@ -120,6 +120,7 @@ export kde_confdir="%{tde_confdir}"
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--sysconfdir=%{tde_sysconfdir} \
+ --mandir=%{tde_mandir} \
--program-prefix="" \
\
--disable-dependency-tracking \
@@ -184,6 +185,6 @@ done
%{tde_datadir}/desktop-directories/*.directory
%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
%{tde_tdedocdir}/HTML/en/systemsettings/
-
+%{tde_mandir}/man1/systemsettings.1*
%changelog
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index 04e66919c..b968ad5eb 100644
--- a/redhat/dependencies/tqt3/tqt3.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -949,10 +949,7 @@ For TQt3 development, you most likely want to install this package.
%{_bindir}/tquic
%{_bindir}/tqmoc
%{_bindir}/tqembed
-%{_mandir}/man1/lupdate-tqt3.1*
-%{_mandir}/man1/lrelease-tqt3.1*
-%{_mandir}/man1/moc-tqt3.1*
-%{_mandir}/man1/uic-tqt3.1*
+%{_mandir}/man1/*.1*
##########
@@ -1479,10 +1476,12 @@ install -D -m644 "attic.tar.gz" "%{?buildroot}%{_docdir}/tqt3-compat-headers/att
popd
# install the man pages
-install -D -m644 "doc/man/man1/moc.1" "%{?buildroot}%{_mandir}/man1/moc-tqt3.1"
-install -D -m644 "doc/man/man1/uic.1" "%{?buildroot}%{_mandir}/man1/uic-tqt3.1"
-install -D -m644 "doc/man/man1/lrelease.1" "%{?buildroot}%{_mandir}/man1/lrelease-tqt3.1"
-install -D -m644 "doc/man/man1/lupdate.1" "%{?buildroot}%{_mandir}/man1/lupdate-tqt3.1"
+%__install -d "%{?buildroot}%{_mandir}/man1"
+%__install -m644 "doc/man/man1/"*"embed.1" "%{?buildroot}%{_mandir}/man1/"
+%__install -m644 "doc/man/man1/"*"lrelease.1" "%{?buildroot}%{_mandir}/man1/"
+%__install -m644 "doc/man/man1/"*"lupdate.1" "%{?buildroot}%{_mandir}/man1/"
+%__install -m644 "doc/man/man1/"*"moc.1" "%{?buildroot}%{_mandir}/man1/"
+%__install -m644 "doc/man/man1/"*"uic.1" "%{?buildroot}%{_mandir}/man1/"
# Install source for the designer tools, such as tqtcreatecw.
cp -ra tools/designer/tools %{?buildroot}%{_datadir}/tqt3/tools
diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec
index d57163534..a129ff5a0 100644
--- a/redhat/main/tdegames/tdegames.spec
+++ b/redhat/main/tdegames/tdegames.spec
@@ -188,6 +188,7 @@ TDE desktop.
%files devel
%defattr(-,root,root,-)
%{tde_datadir}/cmake/libtdegames.cmake
+%{tde_libdir}/pkgconfig/libtdegames.pc
##########
diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec
index e3ae43abc..762edaf56 100644
--- a/redhat/main/tdeutils/tdeutils.spec
+++ b/redhat/main/tdeutils/tdeutils.spec
@@ -958,7 +958,11 @@ export PATH="%{tde_bindir}:${PATH}"
%endif
# Fix desktop shortcut location
-%__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
+ %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+ %__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+ %__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
+fi
# Updates applications categories for openSUSE
%if 0%{?suse_version}
diff --git a/redhat/main/tdewebdev/tdewebdev.spec b/redhat/main/tdewebdev/tdewebdev.spec
index b48ab894d..10475720a 100644
--- a/redhat/main/tdewebdev/tdewebdev.spec
+++ b/redhat/main/tdewebdev/tdewebdev.spec
@@ -238,7 +238,6 @@ This package is part of TDE, as a component of the TDE web development module.
%{tde_datadir}/apps/klinkstatus/
%{tde_datadir}/apps/klinkstatuspart/
%{tde_datadir}/config.kcfg/klinkstatus.kcfg
-%{tde_datadir}/icons/crystalsvg/16x16/actions/bug.png
%{tde_datadir}/icons/hicolor/*/apps/klinkstatus.png
%{tde_datadir}/services/klinkstatus_part.desktop
%{tde_tdedocdir}/HTML/en/klinkstatus/
@@ -521,6 +520,9 @@ pushd %{buildroot}%{tde_datadir}/icons
for i in {16,22,32,64,128}; do %__cp crystalsvg/"$i"x"$i"/apps/kommander.png hicolor/"$i"x"$i"/apps/kommander.png ;done
popd
+# Unwanted icon
+%__rm -f "%{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/actions/bug.png"
+
%clean
%__rm -rf %{buildroot}