diff options
Diffstat (limited to 'redhat/extras')
| -rw-r--r-- | redhat/extras/brp-check-trinity/brp-check-trinity.spec | 6 | ||||
| -rw-r--r-- | redhat/extras/pinentry-tqt/pinentry-tqt.spec | 4 |
2 files changed, 7 insertions, 3 deletions
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 |