diff options
| -rw-r--r-- | redhat/applications/kbibtex/kbibtex-14.0.0.spec | 2 | ||||
| -rw-r--r-- | redhat/applications/kbiff/kbiff-14.0.0.spec | 16 | ||||
| -rw-r--r-- | redhat/applications/kdbg/kdbg-14.0.0.spec | 4 | ||||
| -rw-r--r-- | redhat/buildenv.sh | 3 | ||||
| -rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0.spec | 2 |
5 files changed, 15 insertions, 12 deletions
diff --git a/redhat/applications/kbibtex/kbibtex-14.0.0.spec b/redhat/applications/kbibtex/kbibtex-14.0.0.spec index aa72e8e80..99f215249 100644 --- a/redhat/applications/kbibtex/kbibtex-14.0.0.spec +++ b/redhat/applications/kbibtex/kbibtex-14.0.0.spec @@ -117,10 +117,10 @@ update-desktop-database %{tde_tdeappdir} > /dev/null %{tde_datadir}/apps/kbibtexpart/xslt/MARC21slimUtils.xsl %{tde_datadir}/apps/kbibtexpart/xslt/UNIMARC2MODS3.xsl %{tde_datadir}/apps/kbibtexpart/xslt/html.xsl -%{tde_tdedocdir}/HTML/kbibtex/ %{tde_datadir}/icons/hicolor/*/apps/kbibtex.png %{tde_datadir}/services/kbibtex_part.desktop %{tde_mandir}/man1/kbibtex.1* +%{tde_tdedocdir}/HTML/en/kbibtex/ %changelog diff --git a/redhat/applications/kbiff/kbiff-14.0.0.spec b/redhat/applications/kbiff/kbiff-14.0.0.spec index 15e7c3862..ef6faf02c 100644 --- a/redhat/applications/kbiff/kbiff-14.0.0.spec +++ b/redhat/applications/kbiff/kbiff-14.0.0.spec @@ -70,6 +70,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --exec-prefix=%{tde_prefix} \ --disable-dependency-tracking \ --disable-rpath \ + --disable-static \ --bindir=%{tde_bindir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ @@ -83,28 +84,28 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -# Useless files .. -%__rm -f %{?buildroot}%{tde_libdir}/*.a -%__rm -f %{?buildroot}%{tde_tdelibdir}/*.a +%find_lang %{tde_pkg} -%find_lang kbiff %clean %__rm -rf $RPM_BUILD_ROOT + %post for i in hicolor locolor ; do touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : done + %postun for i in hicolor locolor ; do touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : done -%files -f kbiff.lang + +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog %{tde_bindir}/kbiff @@ -114,10 +115,13 @@ done %{tde_tdelibdir}/kbiff.so %{tde_datadir}/applnk/Internet/kbiff.desktop %{tde_datadir}/apps/kbiff/ -%{tde_tdedocdir}/HTML/kbiff/ %{tde_datadir}/icons/hicolor/*/apps/kbiff.png %{tde_datadir}/icons/locolor/*/apps/kbiff.png %{tde_mandir}/man1/kbiff.1* +%lang(de) %{tde_tdedocdir}/HTML/de/kbiff/ +%lang(en) %{tde_tdedocdir}/HTML/en/kbiff/ +%lang(es) %{tde_tdedocdir}/HTML/es/kbiff/ +%lang(fr) %{tde_tdedocdir}/HTML/fr/kbiff/ %changelog diff --git a/redhat/applications/kdbg/kdbg-14.0.0.spec b/redhat/applications/kdbg/kdbg-14.0.0.spec index 0ca800b19..2b0e91ab2 100644 --- a/redhat/applications/kdbg/kdbg-14.0.0.spec +++ b/redhat/applications/kdbg/kdbg-14.0.0.spec @@ -116,14 +116,14 @@ export PATH="%{tde_bindir}:${PATH}" %post -update-desktop-database %{tde_appdir} > /dev/null +update-desktop-database %{tde_tdeappdir} > /dev/null touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/locolor || : %postun -update-desktop-database %{tde_appdir} > /dev/null +update-desktop-database %{tde_tdeappdir} > /dev/null touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/locolor || : diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh index 408f33759..abccae62c 100644 --- a/redhat/buildenv.sh +++ b/redhat/buildenv.sh @@ -30,8 +30,7 @@ alias grp4='./genrpm.sh -v 14.0.0 -a' # Check if tarballs are more recent than installed packages checknew() { - cd ~/tde/tde-tarballs/14.0.0 - find . -name "trinity-*.tar.gz" | while read f; do + find ~/tde/tde-tarballs/14.0.0 -name "trinity-*.tar.gz" | while read f; do TAR="${f##*/}" NAME="${TAR%-*}" diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index adbb33814..770837eaa 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -119,7 +119,7 @@ BuildRequires: bzip2-devel BuildRequires: libudev-devel # UDISKS support -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_udisks 1 BuildRequires: udisks-devel Requires: udisks |