diff options
Diffstat (limited to 'redhat')
8 files changed, 23 insertions, 14 deletions
diff --git a/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec b/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec index 8eca16600..4bf776156 100644 --- a/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec +++ b/redhat/applications/polkit-agent-tde/polkit-agent-tde.spec @@ -124,6 +124,7 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{_bindir}/polkit-agent-tde +%dir %{_datadir}/autostart %{_datadir}/autostart/polkit-agent-tde.desktop diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/tellico/tellico.spec index d8e8acc36..76e327043 100644 --- a/redhat/applications/tellico/tellico.spec +++ b/redhat/applications/tellico/tellico.spec @@ -170,6 +170,9 @@ BuildRequires: libattr-devel BuildRequires: %{python} BuildRequires: %{python}-devel +# Readline support +BuildRequires: readline-devel + Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release} diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec index bc5d32ba7..403ddbf5a 100644 --- a/redhat/dependencies/polkit-tqt/polkit-tqt.spec +++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec @@ -48,6 +48,7 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc BuildRequires: trinity-cmake >= %{tde_version} BuildRequires: trinity-dbus-1-tqt-devel @@ -150,7 +151,7 @@ This package contains the development libraries and headers. ########## %package -n %{libpolkit_tqt}-examples -Summary: polkit-tqt Documentation +Summary: Polkit-tqt Documentation Group: Development/Libraries/C and C++ Provides: libpolkit-tqt-doc = %{version}-%{release} Requires: %{libpolkit_tqt}0 = %{version}-%{release} diff --git a/redhat/dependencies/polkit-tqt/trinity-polkit-tqt-rpmlintrc b/redhat/dependencies/polkit-tqt/trinity-polkit-tqt-rpmlintrc new file mode 100644 index 000000000..1a56a48f9 --- /dev/null +++ b/redhat/dependencies/polkit-tqt/trinity-polkit-tqt-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('polkit-unauthorized-privilege', 0) +setBadness('suse-dbus-unauthorized-service', 0) diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec index cca9786f1..174391037 100644 --- a/redhat/extras/brp-check-trinity/brp-check-trinity.spec +++ b/redhat/extras/brp-check-trinity/brp-check-trinity.spec @@ -73,8 +73,9 @@ for i in \ map-desktop-category.sh \ suse_update_desktop_file.sh \ ; do - echo "Patching file '/usr/lib/rpm/${i}' ..." [ -r "/usr/lib/rpm/${i}" ] || continue + [ -r "/usr/lib/rpm.orig/${i}" ] && continue + echo "Patching file '/usr/lib/rpm/${i}' ..." install -D "/usr/lib/rpm/${i}" "/usr/lib/rpm.orig/${i}" sed -i "/usr/lib/rpm/${i}" \ -e "s|opt/kde3|opt/trinity|g" \ @@ -86,11 +87,12 @@ for i in \ -e "s|applications/kde|applications/tde|g" \ -e "s|KDE|TDE|g" \ -e "s|kde-|tde-|g" \ -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 +%if 0%{?suse_version} >= 1550 -e "s|/usr/share/applications|/opt/trinity/share/applications|g" \ -e "/^for i in/ s|\\\| /\$RPM_BUILD_ROOT/opt/trinity/share/applnk \\\|" \ %endif -e "s|tde-settings.menu|kde-settings.menu|g" + diff -Nua "/usr/lib/rpm.orig/${i}" "/usr/lib/rpm/${i}" || : done diff --git a/redhat/extras/pinentry-tqt/pinentry-tqt.spec b/redhat/extras/pinentry-tqt/pinentry-tqt.spec index fc958eb36..8c26664fe 100644 --- a/redhat/extras/pinentry-tqt/pinentry-tqt.spec +++ b/redhat/extras/pinentry-tqt/pinentry-tqt.spec @@ -37,7 +37,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}.tar.gz BuildRequires: trinity-tqtinterface-devel -BuildRequires: libsecret-devel BuildRequires: desktop-file-utils BuildRequires: gettext @@ -45,6 +44,9 @@ BuildRequires: gcc-c++ BuildRequires: autoconf automake libtool m4 BuildRequires: pkgconfig +BuildRequires: libassuan-devel +BuildRequires: libsecret-devel + Requires: pinentry diff --git a/redhat/main/tdeaccessibility/tdeaccessibility.spec b/redhat/main/tdeaccessibility/tdeaccessibility.spec index 8f74b81e2..0856bcf0f 100644 --- a/redhat/main/tdeaccessibility/tdeaccessibility.spec +++ b/redhat/main/tdeaccessibility/tdeaccessibility.spec @@ -161,16 +161,7 @@ This package is part of Trinity, as a component of the TDE accessibility module. %files -n trinity-tde-icons-mono %defattr(-,root,root,-) -%dir %{tde_datadir}/icons/mono -%dir %{tde_datadir}/icons/mono/scalable -%dir %{tde_datadir}/icons/mono/scalable/actions -%dir %{tde_datadir}/icons/mono/scalable/apps -%dir %{tde_datadir}/icons/mono/scalable/devices -%dir %{tde_datadir}/icons/mono/scalable/mimetypes -%dir %{tde_datadir}/icons/mono/scalable/places -%{tde_datadir}/icons/mono/index.theme -%{tde_datadir}/icons/mono/png/*/actions/trinity.png -%{tde_datadir}/icons/mono/scalable/*/*.svgz +%{tde_datadir}/icons/mono/ ########## diff --git a/redhat/main/tdewebdev/tdewebdev.spec b/redhat/main/tdewebdev/tdewebdev.spec index d6b7378da..7892fe02b 100644 --- a/redhat/main/tdewebdev/tdewebdev.spec +++ b/redhat/main/tdewebdev/tdewebdev.spec @@ -83,6 +83,7 @@ BuildRequires: brp-check-trinity %endif BuildRequires: libxslt-devel + %if 0%{?rhel} == 4 # a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241) BuildRequires: libgcrypt-devel @@ -97,6 +98,12 @@ BuildRequires: perl BuildRequires: libxml2-devel #endif +# ICU support +BuildRequires: libicu-devel + +# Readline support +BuildRequires: readline-devel + %if "%{?tde_version}" != "14.1.0" %define build_tdefilereplace 1 %endif |