From 619a393e2c3d22bef0823610031416911f8174d7 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:14:38 +0200 Subject: [PATCH 01/26] K3B RPM packaging for TDE 3.5.13 --- .../applications/k3b/k3b-i18n-trinity.patch | 74 +++++++++++++++++++ .../applications/k3b/trinity-k3b-3.5.13.spec | 26 +++---- 2 files changed, 87 insertions(+), 13 deletions(-) create mode 100644 redhat/applications/k3b/k3b-i18n-trinity.patch diff --git a/redhat/applications/k3b/k3b-i18n-trinity.patch b/redhat/applications/k3b/k3b-i18n-trinity.patch new file mode 100644 index 000000000..49ac8a816 --- /dev/null +++ b/redhat/applications/k3b/k3b-i18n-trinity.patch @@ -0,0 +1,74 @@ +--- k3b-i18n-1.0.5/acinclude.m4.ORI 2011-10-30 11:45:36.484658442 +0100 ++++ k3b-i18n-1.0.5/acinclude.m4 2011-10-30 11:53:00.134646577 +0100 +@@ -479,14 +479,14 @@ + if test "$kde_qtver" = "2"; then + kde_moduledir='\${libdir}/kde2' + else +- kde_moduledir='\${libdir}/kde3' ++ kde_moduledir='\${libdir}/trinity' + fi + fi + if test -z "$kde_styledir"; then +- kde_styledir='\${libdir}/kde3/plugins/styles' ++ kde_styledir='\${libdir}/trinity/plugins/styles' + fi + if test -z "$kde_widgetdir"; then +- kde_widgetdir='\${libdir}/kde3/plugins/designer' ++ kde_widgetdir='\${libdir}/trinity/plugins/designer' + fi + if test -z "$xdg_appsdir"; then + xdg_appsdir='\${datadir}/applications/kde' +@@ -546,7 +546,7 @@ + + AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], + [ +- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" ++ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/trinity/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" + test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" + if test -n "$KDEDIRS"; then + kde_save_IFS=$IFS +@@ -612,7 +612,7 @@ + KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) + + if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then +- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" ++ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde3/share /opt/kde/share $prefix/share" + test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) + if test "$KDE_XSL_STYLESHEET" = "NO"; then +@@ -1817,7 +1817,7 @@ + + if test -z "$1"; then + +-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" ++kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" + test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" + kde_incdirs="$ac_kde_includes $kde_incdirs" + AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) +@@ -1829,7 +1829,7 @@ + So, check this please and use another prefix!]) + fi + +-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" ++kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" + test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" + kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" + AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) +@@ -1837,7 +1837,7 @@ + + kde_widgetdir=NO + dnl this might be somewhere else +-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) ++AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) + + if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then + AC_MSG_ERROR([ +@@ -1845,7 +1845,7 @@ + So, check this please and use another prefix!]) + fi + +-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then ++if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then + AC_MSG_ERROR([ + I can't find the designer plugins. These are required and should have been installed + by kdelibs]) diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec index 22f1c4238..59ae57c8e 100644 --- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec +++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec @@ -42,6 +42,8 @@ Patch4: k3b-1.0.4-manualbufsize.patch # RHEL6: Fix K3B icon Patch106: trinity-k3b-icons.patch +# TDE 3.5.13 library directory changed +Patch107: k3b-i18n-trinity.patch BuildRequires: trinity-kdelibs-devel BuildRequires: desktop-file-utils @@ -115,6 +117,8 @@ Requires: %{name}-libs = %{version}-%{release} # set in k3brc too %patch4 -p1 -b .manualbufsize %patch106 -p1 -b .desktopfile +%patch107 + # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -155,27 +159,22 @@ CXXFLAGS="%optflags -fno-strict-aliasing" \ # Build for i18n tarball pushd k3b-i18n-1.0.5 +autoreconf %configure %__make %{?_smp_mflags} popd %install %__rm -rf %{buildroot} -%make_install -%make_install -C k3b-i18n-1.0.5 -%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc +%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C k3b-i18n-1.0.5 +%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc # remove the .la files -%{__rm} -f %{buildroot}%{_libdir}/libk3b*.la +%__rm -f %{buildroot}%{_libdir}/libk3b*.la # remove i18n for Plattdeutsch (Low Saxon) -%{__rm} -fr %{buildroot}%{_datadir}/locale/nds - -%find_lang k3b --with-kde -%find_lang k3bsetup -%find_lang libk3b -%find_lang libk3bdevice -cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang +%__rm -fr %{buildroot}%{_datadir}/locale/nds %check @@ -212,11 +211,12 @@ update-desktop-database -q &> /dev/null %{_bindir}/k3b %{tde_libdir}/*.so %{tde_libdir}/*.la -%doc %{tde_docdir}/HTML/*/k3b/* +%doc %{_docdir}/HTML/*/k3b/* -%files common -f all.lang +%files common %defattr(-,root,root,-) %{_datadir}/applications/kde/*.desktop +%{_datadir}/applnk/.hidden/*.desktop %{_datadir}/apps/k3b/ %{_datadir}/apps/konqueror/servicemenus/*.desktop %{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop From 8b60804696e433d3097495cd594c28a204579a27 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:15:29 +0200 Subject: [PATCH 02/26] Revert macro %make_install Re-add "*.a" files to package. --- redhat/dependencies/arts/trinity-arts-3.5.13.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec index fd2d6104d..76df15c1c 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec @@ -80,7 +80,7 @@ cd build %__make %{?_smp_mflags} %install -%make_install -C build +%__make install -C build DESTDIR=%{?buildroot} %clean %__rm -rf %{?buildroot} @@ -111,7 +111,7 @@ cd build %{_bindir}/artsc-config %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc -%exclude %{_libdir}/*.a +%{_libdir}/*.a %changelog From e74a55645fa75299a8bdfe8ce7c5e64e93500846 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:15:59 +0200 Subject: [PATCH 03/26] Fix description --- redhat/dependencies/libcarddav/libcarddav.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index 9ab0dbd9f..cc01ccc69 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -8,7 +8,7 @@ Packager: Francois Andriot License: GPL Group: System Environment/Libraries -Summary: A client library that adds support for the CalDAV protocol (rfc4791). +Summary: Libcarddav is a portable CardDAV client implementation. Source0: libcarddav_0.6.2-2debian2.tar.gz From 06545090978e8ceed7b2a607286c9c92861c4783 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:16:27 +0200 Subject: [PATCH 04/26] Small fixes --- redhat/dependencies/qt3/qt3.spec | 2 +- redhat/genrpm.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/redhat/dependencies/qt3/qt3.spec b/redhat/dependencies/qt3/qt3.spec index 39786c99e..07485596d 100644 --- a/redhat/dependencies/qt3/qt3.spec +++ b/redhat/dependencies/qt3/qt3.spec @@ -4,7 +4,7 @@ %endif # The following QT4 packages should NOT be installed to -# allow QT3 compilation (please remove them prior to compile) +# allow QT3 compilation (please uninstall them prior to compile) # qt # qt-sqlite # qt-mysql diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index 96d6ce7de..1a57dd898 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -70,11 +70,13 @@ EOF esac set -x + ( rpmbuild -ba \ --define "_sourcedir ${PWD}/${COMP}" \ --define "_prefix ${PREFIX:-/opt/trinity}" \ --define "version ${VERSION:-3.5.13}" \ ${COMP}/${SPEC} || exit 1 + ) 2>&1 | tee /tmp/log set +x done From 9a769a7ea42b5dd8fe17a604080923f7ba9656c1 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:17:39 +0200 Subject: [PATCH 05/26] RPM kdewebdev for TDE 3.5.13 --- redhat/kdewebdev/hi48-app-kxsldbg.png | Bin 0 -> 2652 bytes .../kdewebdev/trinity-kdewebdev-3.5.13.spec | 228 ++++++++++++++++++ 2 files changed, 228 insertions(+) create mode 100644 redhat/kdewebdev/hi48-app-kxsldbg.png create mode 100644 redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec diff --git a/redhat/kdewebdev/hi48-app-kxsldbg.png b/redhat/kdewebdev/hi48-app-kxsldbg.png new file mode 100644 index 0000000000000000000000000000000000000000..a26283571fbae816431d5fbf9b2a7eebe9ab108a GIT binary patch literal 2652 zcmV-i3ZwOjP)vY{JY=UUmY!67&;Ta3U68fU3+b42;AH!Y0~q) z=bZ2RoO9lDo^xbE2*GuXq^ljk^#hZ)f)G*<(iWZ}@yZv0%Xh0bKLHii!#m2n2)> zLP#^v)6>Jy&=3H(-g+xbmMpoFgLg$>x7+b}JhqF+WMqVqkrCj3U>Ev7fvb({oOac&V*RB|bT6y4q3;T|UgYHD z2teF)(@o;lS6`LB2MDcJE57~qTk-bWZ;Pa)B*|{IT18J!j}Sr#i^U=UQBqPOy1KgJ z&w&f!^?G^dop(^FROIF5(cj4VvKub#tXU?1%oATsjqR}WjcI+S!2#}JJf=;JnU|@j#`}ebB#|~0cQz8Og!PgxUM~Pkmo8=H%9Siyv~=dp|NJxGefJ$RXU@du^Ktm_ zVa#STUw!qJL|Cm>&lbBu-096Pq`0j!QB?7z_rnckfkiF`La)RaH@5UXIV_45RFDz zxNsrs*RLlhCx_hj{$)$8k6utX;d7hK2_Gem@R}gOQODv|24jqY;%# zMIaEMudk0_FvyGEy(T6XfOPk)555TCGN_)lyJUfDnSihY!=#)Wob=v$*%(d&$ksB_}5b zuh+}*wtxZ~o$;rv0uC7juM@L78$jZu+>Qq-(i)b_|e*5h=QBhGLQd3hW zypWj9X3^N#D8k{e_~x5$L`q7EDy~U|@jS+FEQjn{+|C5GPNb#BR6a_xtJY?v}JYz>h!vc=4mpG-7V?;>B@g zm&?V54I6N~-E7~!ou;OyIKS0u<=C-f?BBni>0WD;N~LsqkH@7xCQM0S&YU^a*VmJp znkw18|NeUxEn39qpMTEq@GvkY4_2*OMR|ESt*xzbhfaQeJ}oUR96x@XhK2?#77Jx% zWjy=rvt(psTvD(TVOlj>R#rx9Yb$&A?ghq{(y3FY;_A$wKcA|qDsH&p20R{5oKGf` zp;Rg{8jY-3vxe2HR|AlgbY+zMw7uMTZ@j_s<;&T!Web1*{r5jZ0LDn9rlum7%M*O*>FIGJdiULT^T7un zpx5gYMtX2?kdBTHHg4R=GtWFDN$ktPv;>3@oIH7wnwpvkCGFdw1M^EtkvVmQ!0> z8@qS!W^iy27@IXA1R9No;^Jb~tXadhZQCd+DvIm-ufP7ftl(jq8R+cnC&Zf z{^aCjQB+hEXOqcfLakN{g+h^_iT3Q-Bi?=Y-6L~yxW7Y-1iP>9jd(Kvf?aWO?jMbn-MgM))KHa1Gn zFBf9c)@f;J(%ueZI_Jd~UyS=;Nl8fpiPF;2DFXtSH*X$qz4aD(d3oG?^Uc%N*Jw1- zo6&`sGzW@{i>axpp{}lu1q&AN`s=S_G#cX@Cnxjr%P*r;DzV$`SS%KH?%c`7jT@<} ztK-O#BZNXBVzC%CEMLBy`ucjl_~HvmTa8CnRu-E!Z6ZHE zf8s!=x(^5;#OUa#h(@E6YIGrlh{a-JbaYh2VzD@TC=?PdmrL~a_6nEFB|@Rll>JPH zOS%(}ALZ#FlgTEmr&6gdd!L^U*Zt$}{|Q`eT=xW|%+u*~l4`Wu?X{G~8}?!fU~` z0JU08VPPTb*RMyZR089k7SAIP2rw`(aLp3P&d!#ChY1K=Z}=AzufdUsaKPsP0000< KMNUMnLSTZIupi<8 literal 0 HcmV?d00001 diff --git a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec new file mode 100644 index 000000000..ea89ce3ae --- /dev/null +++ b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec @@ -0,0 +1,228 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + +Name: trinity-kdewebdev +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} +License: GPL +Summary: Web development applications +Group: Applications/Editors + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: kdewebdev-%{version}.tar.gz +Source1: http://download.sourceforge.net/quanta/css.tar.bz2 +Source2: http://download.sourceforge.net/quanta/html.tar.bz2 +Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2 +Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2 +Source5: hi48-app-kxsldbg.png + +Patch0: javascript.patch +Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch + + +BuildRequires: desktop-file-utils +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdesdk-devel +BuildRequires: libxslt-devel libxml2-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 +%endif +BuildRequires: perl + +Requires: %{name}-libs = %{version}-%{release} + +# optional +Requires: tidy + +Provides: kdewebdev3 = %{version}-%{release} + +Obsoletes: quanta < %{version}-%{release} +Provides: quanta = %{version}-%{release} + +%define kommander_ver 1.2.2 +#Obsoletes: kommander < %{kommander_ver}-%{release} +Provides: kommander = %{kommander_ver}-%{release} + +%description +%{summary}, including: +* kfilereplace: batch search and replace tool +* kimagemapeditor: HTML image map editor +* klinkstatus: link checker +* kommander: visual dialog building tool +* kxsldbg: xslt Debugger +* quanta+: web development + +%package devel +Group: Development/Libraries +Summary: Header files and documentation for %{name} +Provides: kdewebdev3-devel = %{version}-%{release} +Requires: trinity-kdelibs-devel +Requires: %{name}-libs +Obsoletes: quanta-devel < %{version}-%{release} +%description devel +%{summary}. + +%package libs +Summary: %{name} runtime libraries +Group: System Environment/Libraries +Requires: trinity-kdelibs +# helps multilib upgrades +%description libs +%{summary}. + + +%prep +%setup -q -a 1 -a 2 -a 3 -a 4 -n kdewebdev + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%patch0 -p0 -b .javascript +%patch1 -p1 -b .kxsldbg-icons + +install -m644 -p %{SOURCE5} kxsldbg/ + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common + + +%build +unset QTDIR || : ; source /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%if 0%{?fedora} >= 15 +#export CXXFLAGS="${CXXFLAGS} -fpermissive" +%endif + +%configure \ + --includedir=%{tde_includedir} \ + --disable-rpath \ + --enable-new-ldflags \ + --enable-closure \ + --disable-debug --disable-warnings \ + --disable-dependancy-tracking --enable-final \ + --with-extra-includes=%{_includedir}/tqt \ + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} + + +## package separately? Why doesn't upstream include this? -- Rex +# install docs +for i in css html javascript ; do + pushd $i + ./install.sh < /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun +for f in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%doc rpmdocs/* +%{_bindir}/* +%{tde_libdir}/* +%{_datadir}/applications/kde/* +%{_datadir}/applnk/.hidden/* +%{_datadir}/apps/* +%doc %{_datadir}/apps/quanta/doc +%{_datadir}/config.kcfg/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* +%{_datadir}/mimelnk/application/* +%{_datadir}/services/* +%{_datadir}/servicetypes/* +%doc %lang(en) %{_docdir}/HTML/en/* + + +%files libs +%defattr(-,root,root,-) +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la + +%files devel +%defattr(-,root,root,-) +%{_libdir}/lib*.so +%{tde_includedir}/* + + +%changelog +* Mon Sep 19 2011 Francois Andriot - 3.5.13-0 +- Initial build for RHEL 6 / Fedora 15 From fcc219fa39679a398e74238162798689de41829a Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:17:56 +0200 Subject: [PATCH 06/26] Kdevelop RPM for TDE 3.5.13 --- redhat/kdevelop/trinity-kdevelop-3.5.13.spec | 228 +++++++++++++++++++ 1 file changed, 228 insertions(+) create mode 100644 redhat/kdevelop/trinity-kdevelop-3.5.13.spec diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec new file mode 100644 index 000000000..32aef0d43 --- /dev/null +++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec @@ -0,0 +1,228 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific variables +%define tde_libdir %{_libdir}/trinity + +%define _default_patch_fuzz 2 +%define qt_version 3.3.8d +%define qt_ver %{qt_version} + +Name: trinity-kdevelop +Summary: Integrated Development Environment for C++/C +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + + +License: GPLv2 +URL: http://www.kdevelop.org/ +Group: Development/Tools + +Prefix: %{_prefix} + +Source: kdevelop-%{version}.tar.gz +Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 + +# RedHat Legacy patches +Patch1: c_cpp_reference-2.0.2-config.patch + +Patch100: svn.patch + +Provides: kdevelop3 = %{version}-%{release} + +Requires: %{name}-libs = %{version}-%{release} + + +Requires: trinity-kdelibs-devel +Requires: make +Requires: perl +#Requires: automake libtool +Requires: flex >= 2.5.4 +Requires: qt3-designer +Requires: gettext +Requires: ctags + +#BuildRequires: automake libtool +BuildRequires: cmake >= 2.8 +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdelibs-apidocs +BuildRequires: qt3-devel-docs +BuildRequires: db4-devel +BuildRequires: flex +# FIXME: No CVS support in KDevelop? This is going to suck... +# Requires kdesdk3. +BuildRequires: trinity-kdesdk-devel +BuildRequires: subversion-devel neon-devel +# looks like this is dragged in by apr-devel (dep of subversion-devel), but not +# a dependency +BuildRequires: openldap-devel + +%description +The KDevelop Integrated Development Environment provides many features +that developers need as well as providing a unified interface to programs +like gdb, the C/C++ compiler, and make. KDevelop manages or provides: + +All development tools needed for C++ programming like Compiler, +Linker, automake and autoconf; KAppWizard, which generates complete, +ready-to-go sample applications; Classgenerator, for creating new +classes and integrating them into the current project; File management +for sources, headers, documentation etc. to be included in the +project; The creation of User-Handbooks written with SGML and the +automatic generation of HTML-output with the KDE look and feel; +Automatic HTML-based API-documentation for your project's classes with +cross-references to the used libraries; Internationalization support +for your application, allowing translators to easily add their target +language to a project; + +KDevelop also includes WYSIWYG (What you see is what you get)-creation +of user interfaces with a built-in dialog editor; Debugging your +application by integrating KDbg; Editing of project-specific pixmaps +with KIconEdit; The inclusion of any other program you need for +development by adding it to the "Tools"-menu according to your +individual needs. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Provides: kdevelop3-devel = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Requires: trinity-kdelibs-devel +%description devel +%{summary}. + +%package libs +Summary: %{name} runtime libraries +Group: System Environment/Libraries +Requires: trinity-kdelibs +# helps multilib upgrades +Obsoletes: %{name} < %{version}-%{release} +# include to be paranoid, installing libs-only is still mostly untested -- Rex +Requires: %{name} = %{version}-%{release} +%description libs +%{summary}. + + + +%prep + +%setup -q -n kdevelop -a1 +%patch1 -p0 -b .config + +%patch100 -p1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + + +%__rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin +%__cp -a admin c_cpp_reference-2.0.2_for_KDE_3.0/ +%__make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" +export LD_LIBRARY_PATH="%{_libdir}" + +# c references +pushd c_cpp_reference-2.0.2_for_KDE_3.0 +%configure \ + --with-qt-libraries=$QTDIR/lib \ + --with-qt-includes=$QTDIR/include \ + --with-extra-libs=%{_libdir} +popd + +%__mkdir build +cd build +%cmake \ + -DWITH_BUILDTOOL_ALL=ON \ + -DWITH_LANGUAGE_ALL=ON \ + -DWITH_VCS_ALL=OFF \ + -DBUILD_ALL=ON \ + .. + + +%__make %{?_smp_mflags} + +cd .. +%__make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0 + +%install +%__rm -rf %{buildroot} +cd build +%__make install DESTDIR=%{buildroot} +cd .. +%__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0 + +# remove useless files +%__rm -rf %{buildroot}%{_prefix}/kdevbdb + + +%post +for f in hicolor locolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun +for f in hicolor locolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%{_docdir}/HTML/en/* +%{_bindir}/* +%{tde_libdir}/* +%{_libdir}/kconf_update_bin/* +%{_datadir}/applications/kde/* +%{_datadir}/apps/* +%{_datadir}/config/* +%{_datadir}/desktop-directories/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* +%{_datadir}/mimelnk/*.desktop +%{_datadir}/mimelnk/*/* +%{_datadir}/services/* +%{_datadir}/servicetypes/* + +%files libs +%defattr(-,root,root,-) +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la + +%files devel +%defattr(-,root,root,-) +%{_libdir}/lib*.so +%{_includedir}/* + + +%changelog +* Sat Oct 29 2011 Francois Andriot - 3.5.13-0 +- Initial build for RHEL 6 and Fedora 15 +- Based on SPEC file from Fedora: kdevelop 9:3.5.3-1 From aa56e8adbf18e487f6a58a3a49a86359033dcf82 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:18:20 +0200 Subject: [PATCH 07/26] kdepim, kdeutils, kdesdk RPM for TDE 3.5.13 --- redhat/kdepim/trinity-kdepim-3.5.13.spec | 10 ++++++++-- redhat/kdesdk/trinity-kdesdk-3.5.13.spec | 12 +++++++----- redhat/kdeutils/trinity-kdeutils-3.5.13.spec | 3 +-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec index 604dbd208..c8b4a8c5f 100644 --- a/redhat/kdepim/trinity-kdepim-3.5.13.spec +++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec @@ -38,12 +38,18 @@ BuildRequires: libgpg-error-devel BuildRequires: flex BuildRequires: libical-devel BuildRequires: gnokii-devel +BuildRequires: boost-devel + +BuildRequires: libcaldav-devel +BuildRequires: libcarddav-devel %if 0%{?fedora} >= 15 BuildRequires: flex-static %endif Requires: trinity-kdelibs +Requires: libcaldav +Requires: libcarddav %description PIM (Personal Information Manager) applications. @@ -84,8 +90,8 @@ cd build -DWITH_BIRTHDAYS=ON \ -DWITH_NEWEXCHANGE=ON \ -DWITH_SCALIX=ON \ - -DWITH_CALDAV=OFF \ - -DWITH_CARDDAV=OFF \ + -DWITH_CALDAV=ON \ + -DWITH_CARDDAV=ON \ -DWITH_INDEXLIB=ON \ -DBUILD_ALL=ON \ .. diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec index 00d1d5f3b..19dae5b0b 100644 --- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec +++ b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec @@ -83,7 +83,7 @@ Requires: trinity-kdelibs-devel %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries -Requires: trinity-kdelibs >= %{version} +Requires: trinity-kdelibs # helps multilib upgrades Obsoletes: %{name} < %{version}-%{release} # include to be paranoid, installing libs-only is still mostly untested -- Rex @@ -174,7 +174,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_bindir}/* %{tde_docdir}/HTML/en/* %{_datadir}/apps/* -%{_datadir}/mimelnk/application/* +#%{_datadir}/mimelnk/application/* %{_datadir}/services/* %{_datadir}/servicetypes/* %{_datadir}/icons/crystalsvg/*/*/* @@ -184,7 +184,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/config.kcfg/* %{tde_libdir}/* %{_libdir}/libkdeinit_*.so -%{_mandir}/man1/* +#%{_mandir}/man1/* # Removes conflict with package 'rpmdevtool' on RHEL 6 %if "%{_prefix}" == "/usr" @@ -198,10 +198,12 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files devel %defattr(-,root,root,-) -%{_includedir}/kde/* +%{_includedir}/*.h +%{_includedir}/kbabel %{_libdir}/lib*.so %exclude %{_libdir}/libkdeinit_*.so -%{_libdir}/kmtrace/* +#%{_libdir}/kmtrace/* +%{_datadir}/cmake/*.cmake %changelog diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec index 17acde68e..643344108 100755 --- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec +++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec @@ -100,10 +100,9 @@ export PATH="%{_bindir}:${PATH}" %{tde_libdir}/*.so %{tde_docdir}/HTML/en/* -%if 0%{?rhel} >= 4 %{_datadir}/applnk/*/* %{_datadir}/mimelnk/application/* -%endif + %files devel %defattr(-,root,root,-) From 0ec35e6698277d7bffd10614d99cf099159cc1b3 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:19:01 +0200 Subject: [PATCH 08/26] kdenetwork 3.5.13 RPM --- .../kdenetwork/kdenetwork-3.2.3-resolv.patch | 26 + redhat/kdenetwork/kdenetwork-3.5.8-kppp.patch | 9 + .../kdenetwork-3.5.9-krfb_httpd.patch | 33 ++ .../kdenetwork/kdenetwork-kopete-gcc45.patch | 57 +++ redhat/kdenetwork/kppp.pamd | 4 + redhat/kdenetwork/ktalk | 12 + redhat/kdenetwork/lisa.redhat | 91 ++++ redhat/kdenetwork/lisarc | 10 + redhat/kdenetwork/r1243951.diff | 42 ++ .../kdenetwork/trinity-kdenetwork-3.5.13.spec | 474 ++++++++++++++++++ 10 files changed, 758 insertions(+) create mode 100644 redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch create mode 100644 redhat/kdenetwork/kdenetwork-3.5.8-kppp.patch create mode 100644 redhat/kdenetwork/kdenetwork-3.5.9-krfb_httpd.patch create mode 100644 redhat/kdenetwork/kdenetwork-kopete-gcc45.patch create mode 100644 redhat/kdenetwork/kppp.pamd create mode 100644 redhat/kdenetwork/ktalk create mode 100644 redhat/kdenetwork/lisa.redhat create mode 100644 redhat/kdenetwork/lisarc create mode 100644 redhat/kdenetwork/r1243951.diff create mode 100644 redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec diff --git a/redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch b/redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch new file mode 100644 index 000000000..11d1c6cb6 --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch @@ -0,0 +1,26 @@ +--- kdenetwork-3.2.3/kppp/connect.cpp.orig 2004-07-01 16:03:52.861908057 +0200 ++++ kdenetwork-3.2.3/kppp/connect.cpp 2004-07-01 16:33:35.943692521 +0200 +@@ -1399,9 +1399,13 @@ + + void addpeerdns() { + int fd, fd2; ++ QString p = "/var/run/ppp/resolv.conf"; ++ ++ if (!QFile::exists(p)) ++ p = "/etc/ppp/resolv.conf"; + + if((fd = Requester::rq->openResolv(O_WRONLY|O_APPEND)) >= 0) { +- if((fd2 = open("/etc/ppp/resolv.conf", O_RDONLY)) >= 0) { ++ if((fd2 = open(p.latin1(), O_RDONLY)) >= 0) { + char c; + int i = 0; + while(i++ < 100 && read(fd2, &c, 1) == 1) { +@@ -1412,7 +1416,7 @@ + } + close(fd2); + } else +- fprintf(stderr, "failed to read from /etc/ppp/resolv.conf\n"); ++ fprintf(stderr, "failed to read from %s\n", p.latin1()); + close(fd); + } + add_domain(gpppdata.domain()); diff --git a/redhat/kdenetwork/kdenetwork-3.5.8-kppp.patch b/redhat/kdenetwork/kdenetwork-3.5.8-kppp.patch new file mode 100644 index 000000000..ebd9fa7fa --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-3.5.8-kppp.patch @@ -0,0 +1,9 @@ +diff -up kdenetwork-3.5.8/kppp/Kppp.desktop.kppp kdenetwork-3.5.8/kppp/Kppp.desktop +--- kdenetwork-3.5.8/kppp/Kppp.desktop.kppp 2007-10-08 04:49:13.000000000 -0500 ++++ kdenetwork-3.5.8/kppp/Kppp.desktop 2007-10-13 16:03:03.000000000 -0500 +@@ -66,5 +66,4 @@ Path= + Type=Application + Terminal=false + X-KDE-StartupNotify=true +-X-DCOP-ServiceType=Multi + Categories=Qt;KDE;Network;Dialup; diff --git a/redhat/kdenetwork/kdenetwork-3.5.9-krfb_httpd.patch b/redhat/kdenetwork/kdenetwork-3.5.9-krfb_httpd.patch new file mode 100644 index 000000000..8d7c53693 --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-3.5.9-krfb_httpd.patch @@ -0,0 +1,33 @@ +diff -ur kdenetwork-orig/krfb/krfb_httpd/krfb_httpd kdenetwork-3.5.9/krfb/krfb_httpd/krfb_httpd +--- kdenetwork-orig/krfb/krfb_httpd/krfb_httpd 2007-05-14 09:40:05.000000000 +0200 ++++ kdenetwork-3.5.9/krfb/krfb_httpd/krfb_httpd 2008-02-26 12:43:21.000000000 +0100 +@@ -6,17 +6,14 @@ + fi + + read request url httptype || exit 0 +-url="${url/ +-/}" +-httptype="${httptype/ +-/}" ++url="${url/ /}" ++httptype="${httptype/ /}" + + if [ "x$httptype" != "x" ]; then + line="x" + while [ -n "$line" ]; do + read line || exit 0 +- line="${line/ +-/}" ++ line="${line/ /}" + done + fi + # echo "url = $url, request = $request" >> /tmp/httpd.log +@@ -38,7 +35,7 @@ + content=" + $LOGNAME's desktop + +- ++ + + + " diff --git a/redhat/kdenetwork/kdenetwork-kopete-gcc45.patch b/redhat/kdenetwork/kdenetwork-kopete-gcc45.patch new file mode 100644 index 000000000..f93e68922 --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-kopete-gcc45.patch @@ -0,0 +1,57 @@ +*** kdenetwork/kopete/protocols/testbed/testbedaccount.h.ORI 2011-08-24 00:30:58.403965000 +0200 +--- kdenetwork/kopete/protocols/testbed/testbedaccount.h 2011-08-24 00:31:29.706965000 +0200 +*************** +*** 59,65 **** + /** + * 'Connect' to the testbed server. Only sets myself() online. + */ +! virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus::OnlineStatus() ); + /** + * Disconnect from the server. Only sets myself() offline. + */ +--- 59,65 ---- + /** + * 'Connect' to the testbed server. Only sets myself() online. + */ +! virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() ); + /** + * Disconnect from the server. Only sets myself() offline. + */ +*** kdenetwork/kopete/kopete/contactlist/kopetegroupviewitem.cpp.ORI 2011-08-24 00:28:22.080965001 +0200 +--- kdenetwork/kopete/kopete/contactlist/kopetegroupviewitem.cpp 2011-08-24 00:28:36.149965002 +0200 +*************** +*** 175,181 **** + // the sorting itself is rather slow. Therefore we call delayedSort, which tries + // to group multiple sort requests into one. + using namespace Kopete::UI::ListView; +! if ( ListView::ListView *lv = dynamic_cast( listView() ) ) + lv->delayedSort(); + else + listView()->sort(); +--- 175,181 ---- + // the sorting itself is rather slow. Therefore we call delayedSort, which tries + // to group multiple sort requests into one. + using namespace Kopete::UI::ListView; +! if ( ListView *lv = dynamic_cast( listView() ) ) + lv->delayedSort(); + else + listView()->sort(); +*** kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.cpp.ORI 2011-08-24 00:29:00.953965001 +0200 +--- kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.cpp 2011-08-24 00:29:21.080965001 +0200 +*************** +*** 38,44 **** + KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& ) + : KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" ) + { +! KopeteRichTextEditPart::KopeteRichTextEditPart( wparent, wname, false ); + } + + KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities ) +--- 38,44 ---- + KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& ) + : KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" ) + { +! KopeteRichTextEditPart( wparent, wname, false ); + } + + KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities ) diff --git a/redhat/kdenetwork/kppp.pamd b/redhat/kdenetwork/kppp.pamd new file mode 100644 index 000000000..c7d67e332 --- /dev/null +++ b/redhat/kdenetwork/kppp.pamd @@ -0,0 +1,4 @@ +#%PAM-1.0 +auth include config-util +account include config-util +session include config-util diff --git a/redhat/kdenetwork/ktalk b/redhat/kdenetwork/ktalk new file mode 100644 index 000000000..4458a0964 --- /dev/null +++ b/redhat/kdenetwork/ktalk @@ -0,0 +1,12 @@ +# default: off +# description: KDE version of the talk server (accepting talk requests +# for chatting with users on other systems). +service ntalk +{ + disable = yes + socket_type = dgram + wait = yes + user = root + group = tty + server = /usr/bin/ktalkd +} diff --git a/redhat/kdenetwork/lisa.redhat b/redhat/kdenetwork/lisa.redhat new file mode 100644 index 000000000..bcc059e86 --- /dev/null +++ b/redhat/kdenetwork/lisa.redhat @@ -0,0 +1,91 @@ +#!/bin/bash +# +# Startup script for LISa +# +# chkconfig: - 92 36 +# description: LISa is a small daemon which is intended to run on \ +# end user systems. It provides something like a \ +# "network neighbourhood", but only relying on the TCP/IP \ +# protocol stack, no smb or whatever.\ +# The information about the hosts in your "neighbourhood" \ +# is provided via TCP port 7741. +# processname: lisa +# config: /etc/lisarc + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source function library. +if [ -f /etc/init.d/functions ] ; then + . /etc/init.d/functions +elif [ -f /etc/rc.d/init.d/functions ] ; then + . /etc/rc.d/init.d/functions +else + exit 0 +fi + +# Some definitions. +lisa=/usr/bin/lisa +prog=LISa +OPTIONS="--quiet --config=/etc/lisarc" +RETVAL=0 + +# +start() { + echo -n $"Starting $prog: " + daemon $lisa $OPTIONS + RETVAL=$? + echo + if [ $RETVAL = 0 ] ; then + touch /var/lock/subsys/lisa + else + RETVAL=1 + fi + return $RETVAL +} + +stop() { + echo -n $"Stopping $prog: " + killproc $lisa + RETVAL=$? + echo + if [ $RETVAL = 0 ] ; then + rm -f /var/lock/subsys/lisa + else + RETVAL=1 + fi + return $RETVAL +} + +reload() { + echo -n $"Reloading $prog: " + killproc $lisa -HUP + RETVAL=$? + echo +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status $lisa + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart) + [ -f /var/lock/subsys/lisa ] && restart + ;; + *) + echo $"Usage: $prog {start|stop|restart|status|condrestart}" + exit 1 +esac + +exit $RETVAL diff --git a/redhat/kdenetwork/lisarc b/redhat/kdenetwork/lisarc new file mode 100644 index 000000000..9b5cc84d1 --- /dev/null +++ b/redhat/kdenetwork/lisarc @@ -0,0 +1,10 @@ +PingAddresses = 127.0.0.1/255.255.255.0; +PingNames = +AllowedAddresses = 127.0.0.1/255.255.255.0; +BroadcastNetwork = 127.0.0.1/255.255.255.0; +SearchUsingNmblookup = 0 +FirstWait = 30 +SecondWait = -1 +UpdatePeriod = 150 +DeliverUnnamedHosts = 1 +MaxPingsAtOnce = 256 diff --git a/redhat/kdenetwork/r1243951.diff b/redhat/kdenetwork/r1243951.diff new file mode 100644 index 000000000..1ee7d4e3b --- /dev/null +++ b/redhat/kdenetwork/r1243951.diff @@ -0,0 +1,42 @@ +Index: kdenetwork/kopete/libkopete/avdevice/configure.in.in +=================================================================== +--- kdenetwork/kopete/libkopete/avdevice/configure.in.in (revision 0) ++++ kdenetwork/kopete/libkopete/avdevice/configure.in.in (revision 1243951) +@@ -0,0 +1,21 @@ ++# -- Check for libv4l1-videodev.h presence -------------------- ++ ++AC_MSG_CHECKING([for libv4l1-videodev.h]) ++ ++AC_TRY_COMPILE([ ++#include ++], ++[ ++], ++ ac_have_libv4l1_videodev_h=yes ++, ++ ac_have_libv4l1_videodev_h=no ++) ++ ++if test $ac_have_libv4l1_videodev_h = yes; then ++ AC_DEFINE(HAVE_LIBV4L1_VIDEODEV_H, 1, [Define if you have libv4l1-videodev.h installed]) ++fi ++ ++AC_MSG_RESULT($ac_have_libv4l1_videodev_h) ++ ++# -- End libv4l1-videodev.h ---------------------------------------------- +Index: kdenetwork/kopete/libkopete/avdevice/videodevice.h +=================================================================== +--- kdenetwork/kopete/libkopete/avdevice/videodevice.h (revision 1243950) ++++ kdenetwork/kopete/libkopete/avdevice/videodevice.h (revision 1243951) +@@ -52,7 +52,11 @@ + + #include + #include ++#if defined(HAVE_LIBV4L1_VIDEODEV_H) ++#include ++#else + #include ++#endif + #define VIDEO_MODE_PAL_Nc 3 + #define VIDEO_MODE_PAL_M 4 + #define VIDEO_MODE_PAL_N 5 diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec new file mode 100644 index 000000000..a991df2c8 --- /dev/null +++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec @@ -0,0 +1,474 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +# Fedora review: http://bugzilla.redhat.com/195486 + +## Conditional build: +# disabled, for now, doesn't build -- Rex +#define _enable_jingle --enable-jingle +#define _enable_slp --enable-slp +# RHEL6: xmms is outdated ! +#define _with_xmms --with-xmms +%ifnarch s390 s390x +%define _with_wifi --with-wifi +%endif + +%define console_helper 1 + +Name: trinity-kdenetwork +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} +Summary: K Desktop Environment - Network Applications + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +License: GPLv2 +Group: Applications/Internet + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Provides: kdenetwork3 = %{version}-%{release} + +Source0: kdenetwork-%{version}.tar.gz +Source1: kppp.pamd +Source2: ktalk +Source4: lisarc +Source5: lisa.redhat + +# RedHat/Fedora legacy patches +Patch3: kdenetwork-3.5.8-kppp.patch +Patch4: kdenetwork-3.2.3-resolv.patch +# include more/proper ppp headers +Patch6: kdenetwork-3.5.9-krfb_httpd.patch + +Patch100: svn.patch + +Requires: %{name}-libs = %{version}-%{release} + +BuildRequires: gettext +BuildRequires: trinity-kdelibs-devel +BuildRequires: coreutils +BuildRequires: openssl-devel +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 +BuildRequires: libXmu-devel libXScrnSaver-devel libXtst-devel libXxf86vm-devel +%endif +%if "%{?_with_wifi:1}" == "1" +%if 0%{?fedora} > 5 || 0%{?rhel} > 4 +BuildRequires: wireless-tools-devel +%else +BuildRequires: wireless-tools +%endif +%endif +%{?_enable_slp:BuildRequires: openslp-devel} +## kopete: +BuildRequires: libxml2-devel libxslt-devel +%ifarch %{ix86} +# BR: %{_includedir}/valgrind/valgrind.h +BuildRequires: valgrind +%endif +#jabber +BuildRequires: libidn-devel +#jabber/jingle +%{?_enable_jingle:BuildRequires: expat-devel glib2-devel ortp-devel speex-devel} +# jabber/ssl +#{?fedora:Requires(hint): qca-tls} +# sametime +BuildRequires: meanwhile-devel +%{?_with_xmms:BuildRequires: xmms-devel} +Requires: jasper +## kppp +Requires: ppp +## krdc +Requires: rdesktop +## lisa +Requires(preun): chkconfig +Requires(post): chkconfig +#Requires(hint): samba-client +BuildRequires: avahi-qt3-devel + +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 +BuildRequires: libv4l-devel +%endif + +# The following libraries are not available on RHEL +%if 0%{?fedora} >= 15 +BuildRequires: libgadu-devel +BuildRequires: openslp-devel +BuildRequires: libjingle-devel +%endif + +%if 0%{?console_helper} +Requires: usermode-gtk +%endif + + +%description +Networking applications, including: +* kget: downloader manager +* kio_lan: lan browsing kio slave +* knewsticker: RDF newsticker applet +* kopete: chat client +* kppp: dialer and front end for pppd +* krdc: a client for Desktop Sharing and other VNC servers +* krfb: Desktop Sharing server, allow others to access your desktop via VNC +* lisa: lan information server + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Provides: kdenetwork3-devel = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Requires: trinity-kdelibs-devel +%description devel +%{summary}. + +%package extras +Summary: Extras packages for %{name} +Group: Applications/Internet +Requires: %{name}-libs = %{version}-%{release} +%if "%{?_with_xmms:1}" == "1" +Obsoletes: %{name}-nowlistening < %{version}-%{release} +Provides: %{name}-nowlistening = %{version}-%{release} +%endif +%description extras +More Networking applications for the K Desktop Environment: + * ksirc + * kdict + * ktalkd + * kpf + * kwifimanager +%if "%{?_with_xmms:1}" == "1" + * nowlistening (xmms) plugin for Kopete. +%endif + +%package libs +Summary: %{name} runtime libraries +Group: System Environment/Libraries +Requires: trinity-kdelibs +# helps multilib upgrades +Obsoletes: %{name} < %{version}-%{release} +# include to be paranoid, installing libs-only is still mostly untested -- Rex +Requires: %{name} = %{version}-%{release} +%description libs +%{summary}. + + +%prep +%setup -q -n kdenetwork + +%if %{console_helper} +%patch3 -p1 -b .kppp +%endif +%patch4 -p1 -b .resolv +%patch6 -p1 -b .krfb_httpd + +%patch100 -p1 + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" +export LD_LIBRARY_PATH="%{_libdir}" + +%__mkdir build +cd build +%cmake \ + -DWITH_JINGLE=ON \ + -DWITH_SPEEX=ON \ + -DWITH_WEBCAM=ON \ + -DWITH_GSM=ON \ + -DWITH_ARTS=ON \ + -DBUILD_ALL=ON \ + .. + +# Do not use '%{?_smp_mflags}' because it will fail to build ! +%__make + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +## File lists +# locale's +%find_lang %{name} || touch %{name}.lang +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && %{__rm} -f $i/common && ln -sf ../common $i/common + done + popd + fi +done +fi + +# Show only in KDE, FIXME, need to re-evaluate these -- Rex +for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \ + kwifimanager kget knewsticker ksirc kdict ; do + if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then + echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop + fi +done + +%if %console_helper +# Run kppp through consolehelper +install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3 +mkdir -p %{buildroot}%{_sbindir} +mv %{buildroot}%{_bindir}/kppp %{buildroot}%{_sbindir} +ln -s consolehelper %{buildroot}%{_bindir}/kppp +mkdir -p %{buildroot}/etc/security/console.apps +cat > %{buildroot}/etc/security/console.apps/kppp3 < /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun +for f in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%preun +if [ $1 -eq 0 ]; then + /sbin/chkconfig --del lisa ||: + /sbin/service lisa stop > /dev/null 2>&1 ||: +fi + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%post extras +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done + +%postun extras +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done + + +%clean +%__rm -rf %{buildroot} + + +%files extras +%defattr(-,root,root,-) + +# ksirc +%{tde_docdir}/HTML/??/ksirc/ +%{_bindir}/ksirc +%{_libdir}/libkdeinit_ksirc.* +%{tde_libdir}/ksirc.* +%{_datadir}/applications/kde/ksirc.desktop +%{_datadir}/apps/ksirc/ +%config(noreplace) %{_datadir}/config/ksircrc +%{_datadir}/icons/hicolor/*/apps/ksirc.* + +# kdict +%{tde_docdir}/HTML/en/kdict +%{_bindir}/kdict +%{tde_libdir}/kdict* +%{_libdir}/libkdeinit_kdict.* +%{_datadir}/applications/kde/kdict.desktop +%{_datadir}/apps/kdict +%{_datadir}/apps/kicker/applets/kdictapplet.desktop +%{_datadir}/icons/hicolor/*/apps/kdict.* + +# ktalk +%{tde_docdir}/HTML/en/ktalkd +%{_bindir}/ktalkd* +%{tde_libdir}/kcm_ktalkd.* +%{_datadir}/applications/kde/kcmktalkd.desktop +%config(noreplace) %{_datadir}/config/ktalkdrc +%{_datadir}/icons/crystalsvg/*/apps/ktalkd.* +%{_datadir}/sounds/ktalkd.wav +%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk + +# kpf +%{tde_docdir}/HTML/en/kpf +%{tde_libdir}/kpf* +%{_datadir}/apps/kicker/applets/kpfapplet.desktop +%{_datadir}/icons/crystalsvg/*/apps/kpf.* +%{_datadir}/services/kpfpropertiesdialogplugin.desktop + +%if "%{?_with_wifi:1}" == "1" +# kwifimanager +%doc %{tde_docdir}/HTML/en/kwifimanager +%{_bindir}/kwifimanager +%{tde_libdir}/kcm_wifi.* +%{_datadir}/applications/kde/kcmwifi.desktop +%{_datadir}/applications/kde/kwifimanager.desktop +%{_datadir}/apps/kwifimanager +%{_datadir}/icons/hicolor/*/apps/kwifimanager.png +%endif + +%if "%{?_with_xmms:1}" == "1" +#files nowlistening +#defattr(-,root,root,-) +%{_datadir}/apps/kopete/*nowlisteningchatui* +%{_datadir}/apps/kopete/*nowlisteningui* +%{_datadir}/services/kconfiguredialog/*nowlistening* +%{_datadir}/services/*nowlistening* +%{tde_libdir}/*nowlistening* +%endif + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING README + +# ksirc +%exclude %{_bindir}/ksirc +%exclude %{_libdir}/libkdeinit_ksirc.* +%exclude %{tde_libdir}/ksirc.* +%exclude %{_datadir}/applications/kde/ksirc.desktop +%exclude %{_datadir}/apps/ksirc/ +%exclude %{_datadir}/config/ksircrc +%exclude %{tde_docdir}/HTML/??/ksirc/ +%exclude %{_datadir}/icons/hicolor/??x??/apps/ksirc.png + +# kdict +%exclude %{tde_docdir}/HTML/en/kdict +%exclude %{_bindir}/kdict +%exclude %{tde_libdir}/kdict* +%exclude %{_libdir}/libkdeinit_kdict.* +%exclude %{_datadir}/applications/kde/kdict.desktop +%exclude %{_datadir}/apps/kdict +%exclude %{_datadir}/apps/kicker/applets/kdictapplet.desktop +%exclude %{_datadir}/icons/hicolor/128x128/apps/kdict.png +%exclude %{_datadir}/icons/hicolor/??x??/apps/kdict.png +%exclude %{_datadir}/icons/hicolor/scalable/apps/kdict.svgz + +# ktalk +%exclude %{tde_docdir}/HTML/en/ktalkd +%exclude %{_sysconfdir}/xinetd.d/ktalk +%exclude %{_bindir}/ktalkd* +%exclude %{tde_libdir}/kcm_ktalkd.* +%exclude %{_datadir}/applications/kde/kcmktalkd.desktop +%exclude %{_datadir}/config/ktalkdrc +%exclude %{_datadir}/icons/crystalsvg/128x128/apps/ktalkd.png +%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ktalkd.png +%exclude %{_datadir}/sounds/ktalkd.wav + +# kpf +%exclude %{tde_libdir}/kpf* +%exclude %{_datadir}/apps/kicker/applets/kpfapplet.desktop +%exclude %{tde_docdir}/HTML/en/kpf +%exclude %{_datadir}/icons/crystalsvg/??x??/apps/kpf.png +%exclude %{_datadir}/services/kpfpropertiesdialogplugin.desktop + +%ifnarch s390 s390x +# kwifimanager +%exclude %{_bindir}/kwifimanager +%exclude %{tde_libdir}/kcm_wifi.* +%exclude %{_datadir}/applications/kde/kcmwifi.desktop +%exclude %{_datadir}/applications/kde/kwifimanager.desktop +%exclude %{_datadir}/apps/kwifimanager +%exclude %{tde_docdir}/HTML/en/kwifimanager +%exclude %{_datadir}/icons/hicolor/128x128/apps/kwifimanager.png +%exclude %{_datadir}/icons/hicolor/??x??/apps/kwifimanager.png +%exclude %{_datadir}/icons/hicolor/scalable/apps/kwifimanager.svgz +%endif + +# nowlistening +%if "%{?_with_xmms:1}" == "1" +%exclude %{_datadir}/apps/kopete/*nowlisteningchatui* +%exclude %{_datadir}/apps/kopete/*nowlisteningui* +%exclude %{_datadir}/services/kconfiguredialog/*nowlistening* +%exclude %{_datadir}/services/*nowlistening* +%exclude %{tde_libdir}/*nowlistening* +%endif + +%if %console_helper +%config(noreplace) /etc/security/console.apps/kppp3 +%config(noreplace) /etc/pam.d/kppp3 +%{_sbindir}/kppp +%else +%attr(4755,root,root) %{_bindir}/kppp +%endif +%config(noreplace) %{_sysconfdir}/lisarc +%config(noreplace) %{_initrddir}/lisa +%{_libdir}/libkdeinit_*.so +%{tde_libdir}/* +%{_libdir}/kconf_update_bin/* +%{_bindir}/* +%{_datadir}/apps/* +%{_datadir}/applications/kde/* +%{_datadir}/applnk/.hidden/* +%{_datadir}/config/* +%{_datadir}/config.kcfg/* +%{_datadir}/icons/*/*/*/* +%{_datadir}/mimelnk/* +%{_datadir}/services/* +%{_datadir}/servicetypes/* +%{_datadir}/sounds/* + +%files libs +%defattr(-,root,root,-) +%{_libdir}/libkopete*.so.* +%{_libdir}/libkopete*.la +%{_libdir}/librss.so.* +%{_libdir}/librss.la + +%files devel +%defattr(-,root,root,-) +%{_includedir}/* +%{_libdir}/libkopete*.so +%{_libdir}/librss.so + + +%changelog +* Tue Oct 25 2011 Francois Andriot - 3.5.13-0 +- Initial version + From 26fc278c18dac39af1708b603d0dbf46e16da622 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:19:29 +0200 Subject: [PATCH 09/26] kdelibs, kdemultimedia, kdetoys 3.5.13 RPM --- redhat/kdelibs/trinity-kdelibs-3.5.13.spec | 2 + .../trinity-kdemultimedia-3.5.13.spec | 47 ++--- redhat/kdetoys/trinity-kdetoys-3.5.13.spec | 162 ++++++++++++++++++ 3 files changed, 188 insertions(+), 23 deletions(-) create mode 100644 redhat/kdetoys/trinity-kdetoys-3.5.13.spec diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index 4b98b33f9..682142a65 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -39,6 +39,8 @@ BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel BuildRequires: libutempter-devel BuildRequires: bzip2-devel BuildRequires: openssl-devel +BuildRequires: libtiff-devel +BuildRequires: jasper-devel Requires: tqtinterface Requires: trinity-arts diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index adcafccb5..868754041 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -47,6 +47,9 @@ Provides: kdemultimedia3 = %{version}-%{release} Patch3: kdemultimedia-3.4.0-xdg.patch Patch5: kdemultimedia-3.5.7-pthread.patch +Patch100: svn.patch + + Requires: %{name}-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -93,14 +96,7 @@ noatun plugins. %package extras Summary: Extra applications from %{name} Group: Applications/Multimedia -%if 0%{?libs} Requires: %{name}-extras-libs = %{version}-%{release} -%else -Obsoletes: %{name}-extras-libs < %{version}-%{release} -Provides: %{name}-extras-libs = %{version}-%{release} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -%endif %description extras %{summary}, including: * juk, a media player @@ -129,6 +125,8 @@ Requires: %{name} = %{version}-%{release} %patch3 -p1 -b .xdg %patch5 -p1 -b .pthread +%patch100 -p1 + # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! sed -i admin/acinclude.m4.in \ @@ -141,14 +139,9 @@ sed -i admin/acinclude.m4.in \ %build unset QTDIR || : ; . /etc/profile.d/qt.sh - -# just to be paranoid -- Rex -unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" -export CXXFLAGS="${LDFLAGS} $(pkg-config --libs gsl)" - %configure \ --enable-new-ldflags \ --disable-dependency-tracking \ @@ -168,19 +161,19 @@ export CXXFLAGS="${LDFLAGS} $(pkg-config --libs gsl)" %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \ %{?_with_taglib} %{!?_with_taglib:--without-taglib} \ %{?_with_xine} %{!?_with_xine:--without-xine} \ - --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt + --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt \ + --enable-closure %__make %{?_smp_mflags} %install +export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} - -%make_install -%make_install -C kaudiocreator +%__make install DESTDIR=%{buildroot} ## Remove/uninstall (conflicting) bits we don't want -rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass +%__rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass # only show in KDE, really? -- Rex (FIXME) for f in %{buildroot}%{appdir}/*.desktop ; do @@ -225,7 +218,7 @@ done %post -%{?libs:/sbin/ldconfig} +/sbin/ldconfig for f in crystalsvg hicolor locolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: @@ -233,14 +226,13 @@ done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun -%{?libs:/sbin/ldconfig} +/sbin/ldconfig for f in crystalsvg hicolor locolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : -%if 0%{?libs} %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -248,10 +240,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %post extras-libs -p /sbin/ldconfig %postun extras-libs -p /sbin/ldconfig -%endif %post extras -%{?libs:/sbin/ldconfig} +/sbin/ldconfig for f in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: @@ -259,7 +250,7 @@ done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun extras -%{?libs:/sbin/ldconfig} +/sbin/ldconfig for f in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: @@ -372,6 +363,16 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/services/* %{_datadir}/servicetypes/* +# Misc HTML docs +%doc %lang(en) %{tde_docdir}/HTML/en/artsbuilder +%doc %lang(en) %{tde_docdir}/HTML/en/kaudiocreator +%doc %lang(en) %{tde_docdir}/HTML/en/kioslave/audiocd.docbook +%doc %lang(en) %{tde_docdir}/HTML/en/kmid +%doc %lang(en) %{tde_docdir}/HTML/en/kmix +%doc %lang(en) %{tde_docdir}/HTML/en/krec +%doc %lang(en) %{tde_docdir}/HTML/en/kscd + + %files libs %defattr(-,root,root,-) %exclude %{_libdir}/libnoatun*.* diff --git a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec new file mode 100644 index 000000000..ef533a8db --- /dev/null +++ b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec @@ -0,0 +1,162 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Summary: K Desktop Environment - Toys and Amusements +Name: trinity-kdetoys +Group: Amusements/Graphics +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Source0: kdetoys-%{version}.tar.gz + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: desktop-file-utils +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: gettext + + +%description +Includes: +* amor: Amusing Misuse Of Resources put's comic figures above your windows +* eyesapplet: a kicker applet similar to XEyes +* fifteenapplet: kicker applet, order 15 pieces in a 4x4 square by moving them +* kmoon: system tray applet showing the moon phase +* kodo: mouse movement meter +* kteatime: system tray applet that makes sure your tea doesn't get too strong +* ktux: Tux-in-a-Spaceship screen saver +* kweather: kicker applet that will display the current weather outside +* kworldwatch: application and kicker applet showing daylight area on the world + globe + +NOTE: kicker applets and screen savers require kdebase to be installed, +and user to be logged-in to KDE. + + +%prep +%setup -q -n kdetoys + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --includedir=%{_includedir}/kde \ + --disable-rpath \ + --enable-new-ldflags \ + --enable-closure \ + --disable-debug --disable-warnings \ + --disable-dependency-tracking --enable-final \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf "%{buildroot}" +%__make install DESTDIR=%{buildroot} + +desktop-file-install \ + --dir=%{buildroot}%{_datadir}/applnk/System/ScreenSavers \ + --vendor="" \ + %{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ||: + +desktop-file-install \ + --dir=%{buildroot}%{_datadir}/applications/kde \ + --vendor="" \ + %{buildroot}%{_datadir}/applications/kde/*.desktop ||: + +# replace absolute symlink with relative +ln -nfs tips-en %{buildroot}%{_datadir}/apps/amor/tips + +## File lists +# locale's +%find_lang %{name} || touch %{name}.lang +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common + done + popd + fi +done +fi + +## Unpackaged files +# not sure the point of just one header file 'AmorIface.h', omit (for now). +%__rm -rf %{buildroot}%{_includedir} + + +%post +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: + +%postun +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING README +%{_bindir}/* +%{_libdir}/libkdeinit_*.* +%{tde_libdir}/* +%{_datadir}/applications/kde/*.desktop +%{_datadir}/applnk/System/ScreenSavers/*.desktop +%{_datadir}/apps/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/service*/*.desktop +%doc %lang(en) %{_docdir}/HTML/en/* + +%clean +%__rm -rf %{buildroot} + + +%changelog +* Fri Oct 28 2011 Francois Andriot - 3.5.13-0 +- Initial version for RHEL 6 and Fedora 15 + From 6e364689d85a063c565039b519091a608e71c659 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:20:44 +0200 Subject: [PATCH 10/26] kdeartwork, kdebase, kdebindings, kdeedu, kdegames, kdegraphics 3.5.13 RPM --- .../kdeartwork/trinity-kdeartwork-3.5.13.spec | 57 +-- redhat/kdeartwork/webcollagerc | 3 + redhat/kdebase/trinity-kdebase-3.5.13.spec | 25 +- .../trinity-kdebindings-3.5.13.spec | 14 +- redhat/kdeedu/trinity-kdeedu-3.5.13.spec | 238 ++++++++++++ redhat/kdegames/trinity-kdegames-3.5.13.spec | 196 ++++++++++ .../trinity-kdegraphics-3.5.13.spec | 342 ++++++++++++++++++ 7 files changed, 839 insertions(+), 36 deletions(-) create mode 100644 redhat/kdeartwork/webcollagerc create mode 100644 redhat/kdeedu/trinity-kdeedu-3.5.13.spec create mode 100644 redhat/kdegames/trinity-kdegames-3.5.13.spec create mode 100644 redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec diff --git a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec index 6a0ef7146..1f48d1611 100644 --- a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec +++ b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec @@ -11,17 +11,23 @@ %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 %define tde_libdir %{_libdir}/trinity +# kdeartwork specific settings +# On RHEL 6, libart is too old ! +%if 0%{?fedora} >= 15 +%define with_libart 1 +%endif + Name: trinity-kdeartwork -Summary: Additional artwork (themes, sound themes, ...) for KDE +Summary: Additional artwork (themes, sound themes, ...) for TDE Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPLv2 -Group: User Interface/Desktops +Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Vendor: Trinity Project @@ -35,8 +41,11 @@ Source1: webcollagerc BuildRequires: gettext BuildRequires: trinity-kdebase-devel -BuildRequires: libart_lgpl-devel BuildRequires: nas-devel esound-devel jack-audio-connection-kit-devel +BuildRequires: xscreensaver +%if "%{?with_libart}" == "1" +BuildRequires: libart_lgpl-devel +%endif Requires: trinity-kdebase @@ -54,24 +63,27 @@ Group: User Interface/Desktops %prep %setup -q -n kdeartwork -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" - - -%configure \ - --disable-rpath \ - --enable-new-ldflags \ - --disable-dependency-tracking \ - --disable-debug --disable-warnings \ - --enable-final \ - --with-extra-includes=%{_includedir}/tqt +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" +export LD_LIBRARY_PATH="%{_libdir}" + +%__mkdir build +cd build +%cmake \ + -DWITH_XSCREENSAVER=ON \ +%if "%{?with_libart}" == "1" + -DWITH_LIBART=ON \ +%else + -DWITH_LIBART=OFF \ +%endif + -DWITH_OPENGL=ON \ + -DWITH_ARTS=ON \ + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} @@ -79,8 +91,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %install export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} - -%make_install +%__make install -C build DESTDIR=%{buildroot} # webcollage -root -directory /usr/share/backgrounds/images #227683 @@ -123,17 +134,17 @@ done %post icons for i in locolor ikons kdeclassic kids slick ; do touch --no-create %{_datadir}/icons/$i 2>/dev/null || : - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || : + gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || : done %postun icons for i in locolor ikons kdeclassic kids slick ; do touch --no-create %{_datadir}/icons/$i 2>/dev/null || : - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || : + gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || : done %clean -rm -rf %{buildroot} +%__rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) diff --git a/redhat/kdeartwork/webcollagerc b/redhat/kdeartwork/webcollagerc new file mode 100644 index 000000000..fc901454a --- /dev/null +++ b/redhat/kdeartwork/webcollagerc @@ -0,0 +1,3 @@ +[directory] +Value=/usr/share/backgrounds/images/ + diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index c52d2f2b0..a35207c56 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -30,6 +30,9 @@ Prefix: %{_prefix} Source0: kdebase-%{version}.tar.gz +# Wrapper script to prevent Plasma launch at Trinity Startup +Source1: plasma-desktop + # TDE for RHEL/Fedora specific patches # [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch @@ -61,6 +64,7 @@ BuildRequires: pam-devel BuildRequires: libXdmcp-devel BuildRequires: libxkbfile-devel BuildRequires: dbus-tqt-devel +BuildRequires: libXtst-devel Requires: tqtinterface Requires: trinity-arts @@ -90,7 +94,7 @@ kfontmanager, kmenuedit). %package devel Requires: %{name} -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: trinity-kdelibs-devel Summary: %{summary} - Development files %if "%{?_prefix}" == "/usr" @@ -106,7 +110,7 @@ Kate plugins or KWin styles. %package extras Summary: Extra applications from %{name} Group: User Interface/Desktops -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description extras %{summary}, including: * kappfinder @@ -118,11 +122,11 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries -Requires: trinity-kdelibs >= %{version} +Requires: trinity-kdelibs %if "%{?_prefix}" == "/usr" Obsoletes: kdebase3-libs %endif -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description libs %{summary} @@ -144,9 +148,6 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch5 -p1 %patch6 -p1 -# Gets the cmake modules in current build directory -%__mkdir_p cmake/modules -%__cp -f %{_datadir}/cmake/*.* cmake/modules %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -201,6 +202,11 @@ sed -i "%{?buildroot}%{_bindir}/startkde" \ # Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard' mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde +# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4 +%if "%{?_prefix}" != "/usr" +%{__cp} -f "%{SOURCE1}" "%{?buildroot}%{_bindir}" +%endif + %clean %__rm -rf %{?buildroot} @@ -418,8 +424,13 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/services/pop3*.protocol %exclude %{_datadir}/services/smtp*.protocol +# New in TDE 3.5.12 +%{_bindir}/plasma-desktop + # New in TDE 3.5.13 %{_bindir}/krootbacking +%{_bindir}/tsak +%attr(4511,root,root) %{_bindir}/kdmtsak %files libs %defattr(-,root,root,-) diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec index f4ea50005..f0b76045b 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec @@ -13,6 +13,7 @@ # TDE 3.5.13 specific building variables BuildRequires: autoconf automake libtool m4 %define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity @@ -26,7 +27,7 @@ Group: User Interface/Desktops Vendor: Trinity Project Packager: Francois Andriot -URL: http://developer.kde.org/language-bindings/ +URL: http://www.trinitydesktop.org/ Source0: kdebindings-%{version}.tar.gz @@ -114,7 +115,7 @@ unset JAVA_HOME ||: export DO_NOT_COMPILE="$DO_NOT_COMPILE python" %configure \ - --includedir=%{_includedir}/kde \ + --includedir=%{tde_includedir} \ --disable-rpath \ --enable-new-ldflags \ --disable-debug --disable-warnings \ @@ -145,8 +146,8 @@ popd %install -%__rm -rf $RPM_BUILD_ROOT export PATH="%{_bindir}:${PATH}" +%__rm -rf $RPM_BUILD_ROOT %make_install \ PYTHON=%{__python} @@ -206,7 +207,8 @@ for dir in dcopperl dcoppython kalyptus %{?_with_java:kdejava qtjava} kjsembed k done %clean -rm -rf $RPM_BUILD_ROOT +%__rm -rf $RPM_BUILD_ROOT + %post /sbin/ldconfig ||: @@ -255,8 +257,8 @@ update-desktop-database >& /dev/null ||: # Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6) %if "%{?_prefix}" == "/usr" %exclude %{_bindir}/kjscmd -%exclude %{_mandir}/man1/kjscmd* %endif +%exclude %{_mandir}/man1/kjscmd* %files dcopperl -f %{name}-dcopperl.list @@ -266,7 +268,7 @@ update-desktop-database >& /dev/null ||: %files devel %defattr(-,root,root,-) -%{_includedir}/kde/* +%{tde_includedir}/* %{_libdir}/lib*.so %if "%{?_with_java:1}" == "1" %{_libdir}/jni/*.so diff --git a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec new file mode 100644 index 000000000..72f8e2c72 --- /dev/null +++ b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec @@ -0,0 +1,238 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-kdeedu +Summary: Educational/Edutainment applications +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2 +Group: Amusements/Games + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: kdeedu-%{version}.tar.gz + +Patch100: svn.patch + +Provides: kdeedu3 = %{version}-%{release} + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +Requires: %{name}-libs = %{version}-%{release} + +BuildRequires: desktop-file-utils +BuildRequires: trinity-kdelibs-devel +BuildRequires: python-devel python +BuildRequires: boost-devel +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 +BuildRequires: ocaml(compiler) +%else +BuildRequires: ocaml +%endif +#BuildRequires: ocaml-facile-devel + + +%description +Educational/Edutainment applications, including: +* blinken: Simon Says Game +* kalzium: Periodic Table of Elements +* kanagram: Letter Order Game +* kbruch: Exercise Fractions +* keduca: Tests and Exams +* kgeography: Geography Trainer +* khangman: Hangman Game +* kig: Interactive Geometry +* kiten: Japanese Reference/Study Tool +* klatin: Latin Reviser +* klettres: French alphabet tutor +* kmplot: Mathematical Function Plotter +* kpercentage: Excersie Percentages +* kstars: Desktop Planetarium +* ktouch: Touch Typing Tutor +* kturtle: Logo Programming Environment +* kverbos: Study Spanish Verbforms +* kvoctrain: Vocabulary Trainer +* kwordquiz: Vocabulary Trainer + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Provides: kdeedu3-devel = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +%description devel +%{summary}. + +%package libs +Summary: %{name} runtime libraries +Group: System Environment/Libraries +Requires: trinity-kdelibs +# include to be paranoid, installing libs-only is still mostly untested -- Rex +Requires: %{name} = %{version}-%{release} +%description libs +%{summary}. + + +%prep +%setup -q -n kdeedu + +%patch100 -p1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%if 0%{?rhel} > 0 +rm -rf doc/kgeography kgeography +perl -pi -e "s|kgeography||" subdirs +%endif + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +# Fix link with kparts +export CXXFLAGS="${CXXFLAGS} -lkparts" + +%if 0%{?fedora} +export CXXFLAGS="${CXXFLAGS} -fpermissive" +%endif + +%configure \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-rpath \ +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 + --enable-kig-python-scripting \ +%else + --disable-kig-python-scripting \ +%endif + --disable-debug \ + --disable-warnings \ + --enable-final \ + --enable-closure \ + --includedir=%{_includedir}/kde \ + --disable-ocamlsolver \ + --with-extra-includes=%{_includedir}/tqt + + +%__make \ + OCAMLLIB=$(ocamlc -where) FACILELIB=$(ocamlc -where) + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +# locale's +%find_lang %{name} || touch %{name}.lang +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common + done + popd + fi +done +fi + +# rpmdocs +for dir in blinken k* ; do + for file in AUTHORS ChangeLog README TODO ; do + test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" + done +done + + +%clean +%__rm -rf %{buildroot} + + +%post +for i in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/$i 2>/dev/null || : + gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || : +done +update-desktop-database >& /dev/null ||: + +%postun +for i in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/$i 2>/dev/null || : + gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || : +done +update-desktop-database >& /dev/null ||: + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc README COPYING +%doc rpmdocs/* +%{_bindir}/* +%{_datadir}/applications/kde/* +# FIXME +%{_datadir}/applnk/Edutainment/ +%{_datadir}/apps/* +%config %{_datadir}/config*/* +%{_datadir}/mimelnk/*/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* +%{_datadir}/services/* +%{tde_libdir}/* +%doc %lang(en) %{_docdir}/HTML/en/* + +%files libs +%defattr(-,root,root,-) +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la + +%files devel +%defattr(-,root,root,-) +%doc libkdeedu/AUTHORS libkdeedu/README +%{tde_includedir}/* +%{_libdir}/lib*.so + + +%changelog +* Sat Sep 09 2011 Francois Andriot - 3.5.13-0 +- Initial build for RHEL 6 diff --git a/redhat/kdegames/trinity-kdegames-3.5.13.spec b/redhat/kdegames/trinity-kdegames-3.5.13.spec new file mode 100644 index 000000000..14d8d0f55 --- /dev/null +++ b/redhat/kdegames/trinity-kdegames-3.5.13.spec @@ -0,0 +1,196 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-kdegames +Summary: Trinity Desktop Environment - Games +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2 +Group: Amusements/Games + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source: kdegames-%{version}.tar.gz + +Provides: kdegames3 = %{version}-%{release} + +Requires: %{name}-libs = %{version}-%{release} + +BuildRequires: trinity-kdelibs-devel + +%description +Games and gaming libraries for the K Desktop Environment. +Included with this package are: kenolaba, kasteroids, kblackbox, kmahjongg, +kmines, konquest, kpat, kpoker, kreversi, ksame, kshisen, ksmiletris, +ksnake, ksirtet, katomic, kjumpingcube, ktuberling. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +License: LGPLv2 +Provides: kdegames3-devel = %{version}-%{release} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kdelibs-devel +%description devel +%{summary}. +Install %{name}-devel if you wish to develop or compile games for the +KDE desktop. + +%package libs +Summary: %{name} runtime libraries +Group: System Environment/Libraries +Requires: trinity-kdelibs +License: LGPLv2 +# include to paranoid, installing libs-only is still mostly untested -- Rex +#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +%description libs +%{summary}. + + + +%prep +%setup -q -n kdegames + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%if 0%{?fedora} > 0 +export CXXFLAGS="${CXXFLAGS} -lkio" +%endif + +%configure \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-rpath \ + --enable-final \ + --disable-debug \ + --disable-warnings \ + --enable-closure \ + --includedir=%{_includedir}/kde \ + --disable-setgid \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +# locale's +%find_lang %{name} || touch %{name}.lang +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common + done + popd + fi +done +fi + +# rpmdocs +for dir in k* lskat ; do + for file in AUTHORS ChangeLog README TODO ; do + test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" + done +done + + +%clean +%__rm -rf %{buildroot} + + +%post +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS README COPYING +%doc rpmdocs/* +%{_bindir}/* +%{_datadir}/applications/kde/*.desktop +%{_datadir}/apps/* +%{_datadir}/config*/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/mimelnk/*/* +%{_datadir}/service*/* +%{tde_libdir}/* +%{_libdir}/libkdeinit_*.so +%doc %lang(en) %{_docdir}/HTML/en/* + +%files libs +%defattr(-,root,root,-) +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la + +%files devel +%defattr(-,root,root,-) +%doc COPYING.LIB +%doc libkdegames/README libkdegames/TODO +%{tde_includedir}/* +%{_libdir}/lib*.so +%exclude %{_libdir}/libkdeinit_*.so + + +%changelog +* Sat Sep 09 2011 Francois Andriot - 3.5.13-0 +- Initial build for RHEL 6 diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec new file mode 100644 index 000000000..b988eddca --- /dev/null +++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec @@ -0,0 +1,342 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir} +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-kdegraphics +Version: %{?version} +Release: %{?release}%{?dist}%{_variant} +License: GPL +Summary: K Desktop Environment - Graphics Applications + +Group: Applications/Multimedia +Prefix: %{_prefix} + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Source0: kdegraphics-%{version}.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: gettext +BuildRequires: libmng-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: libungif-devel +BuildRequires: automake libtool +BuildRequires: gphoto2-devel +BuildRequires: sane-backends-devel +BuildRequires: libusb-devel + +# kgamma +BuildRequires: libXxf86vm-devel +# kuickshow +BuildRequires: imlib-devel +#kfile-plugin +BuildRequires: OpenEXR-devel +# kpdf +BuildRequires: freetype-devel +BuildRequires: poppler-qt-devel +BuildRequires: libpaper-devel +# ksvg +BuildRequires: fontconfig-devel +BuildRequires: fribidi-devel +BuildRequires: lcms-devel +BuildRequires: libart_lgpl-devel +BuildRequires: libXmu-devel +# kpovmodeler +BuildRequires: libGL-devel libGLU-devel libXi-devel + +Requires: tqtinterface +Requires: trinity-arts +Requires: trinity-kdelibs +Requires: ghostscript +Requires: %{name}-libs = %{version}-%{release} + +%if "%{_prefix}" == "/usr" +Provides: kdegraphics3 = %{version}-%{release} +Conflicts: kdegraphics +%endif + +%description +Graphics applications for the K Desktop Environment, including +* kamera (digital camera support) +* kcoloredit (palette editor and color chooser) +* kdvi (displays TeX .dvi files) +* kghostview (displays postscript files) +* kiconedit (icon editor) +* kooka (scanner application) +* kpdf (displays PDF files) +* kruler (screen ruler and color measurement tool) +* ksnapshot (screen capture utility) +* kview (image viewer for GIF, JPEG, TIFF, etc.) + +%package devel +Summary: Development files for %{name} +Provides: kdegraphics3-devel = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Group: Development/Libraries +%description devel +%{summary}. + +## FIXME: move more stuff to -extras +%package extras +Summary: Extra applications from %{name} +Group: Applications/Multimedia +Requires: %{name}-libs = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +%description extras +%{summary}, including: +* kfax +* kfaxview +* kpovmodler + +%package libs +Summary: %{name} runtime libraries +Group: System Environment/Libraries +Requires: trinity-kdelibs >= %{version} +# include to be paranoid, installing libs-only is still mostly untested -- Rex +Requires: %{name} = %{version}-%{release} +%description libs +%{summary}. + + + +%prep +%setup -q -n kdegraphics + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-rpath \ + --disable-debug \ + --disable-warnings \ + --enable-final \ + --enable-closure \ + --includedir=%{_includedir}/kde \ + --with-extra-includes=%{_includedir}/tqt + +%if 0%{?fedora} >= 15 +# Ugly fix for kolourpaint - problem when linking libkdefx.so +sed -i kolourpaint/Makefile \ + -e 's,\($(kolourpaint_LINK) $(kolourpaint_OBJECTS) $(kolourpaint_LDADD) \)\($(LIBS)\),\1 -lkdefx \2,' + +# Another ugly fix for kpdf - problem when linking fontconfig +sed -i kpdf/Makefile \ + -e '/^LDFLAGS = .*/ s,$, -lfontconfig,' +%endif + +%__make %{?_smp_mflags} + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} + +make install DESTDIR=%{buildroot} + +# locale's +%find_lang %{name} || touch %{name}.lang +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common + done + popd + fi +done +fi + +# rpmdocs +for dir in k* ; do + for file in AUTHORS ChangeLog README TODO ; do + if test -s "$dir/$file" ; then + install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" + echo "%doc rpmdocs/$dir/" >> %{name}.lang + fi + done +done + +# unpackaged files +# omit kpovmodeler-devel files (for now) -- Rex +rm -f %{buildroot}/libkpovmodeler.so + + +%clean +rm -rf %{buildroot} + + +%post +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%post extras +/sbin/ldconfig ||: +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun extras +/sbin/ldconfig ||: +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + + +%files extras +%defattr(-,root,root,-) + +# kfax +%doc rpmdocs/kfax/ +%{_bindir}/kfax +%{_datadir}/applications/kde/kfax.desktop +%{_datadir}/apps/kfax/ +%{_datadir}/icons/hicolor/??x??/apps/kfax.png +%{_datadir}/icons/hicolor/scalable/apps/kfax.svgz + +# kfaxview +%{_bindir}/kfaxview +%{_libdir}/libkfaximage.so +%{_libdir}/libkfaximage.la +%{tde_libdir}/kfaxviewpart.* +%{_datadir}/applications/kde/kfaxview.desktop +%{_datadir}/apps/kfaxview/ +%{_datadir}/icons/hicolor/??x??/apps/kfaxview.png +%{_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz +%{_datadir}/services/kfaxmultipage.desktop +%{_datadir}/services/kfaxmultipage_tiff.desktop + +# kpovmodeler +%doc rpmdocs/kpovmodeler/ +%doc %{_docdir}/HTML/en/kpovmodeler/ +%{_bindir}/kpovmodeler +%{_libdir}/libkpovmodeler.so.* +%{_libdir}/libkpovmodeler.la +%{tde_libdir}/libkpovmodelerpart.* +%{_datadir}/applications/kde/kpovmodeler.desktop +%{_datadir}/apps/kpovmodeler/ +%{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* +%{_datadir}/icons/hicolor/*/apps/kpovmodeler.* + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING README +%doc rpmdocs/* + +# kfax +%exclude %{_bindir}/kfax +%exclude %{_datadir}/applications/kde/kfax.desktop +%exclude %{_datadir}/apps/kfax/ +%exclude %{_datadir}/icons/hicolor/*/apps/kfax.* + +# kfaxview +%exclude %{_bindir}/kfaxview +%exclude %{_libdir}/libkfaximage.so +%exclude %{_libdir}/libkfaximage.la +%exclude %{tde_libdir}/kfaxviewpart.* +%exclude %{_datadir}/applications/kde/kfaxview.desktop +%exclude %{_datadir}/apps/kfaxview/ +%exclude %{_datadir}/icons/hicolor/*/apps/kfaxview.* +%exclude %{_datadir}/services/kfaxmultipage.desktop +%exclude %{_datadir}/services/kfaxmultipage_tiff.desktop + +# kpovmodeler +%exclude %{tde_docdir}/HTML/en/kpovmodeler/ +%exclude %{_bindir}/kpovmodeler +%exclude %{_libdir}/libkpovmodeler.* +%exclude %{tde_libdir}/libkpovmodelerpart.* +%exclude %{_datadir}/applications/kde/kpovmodeler.desktop +%exclude %{_datadir}/apps/kpovmodeler/ +%exclude %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* +%exclude %{_datadir}/icons/hicolor/*/apps/kpovmodeler.* + +%{_bindir}/* +%{_datadir}/applications/kde/*.desktop +%{_datadir}/applnk/Graphics/*kruler.desktop +%{_datadir}/apps/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/config*/* +%{_datadir}/service*/* +%{_datadir}/mimelnk/*/* +%{_libdir}/libkdeinit_*.so +%{tde_libdir}/* + +%files libs +%defattr(-,root,root,-) +%exclude %{_libdir}/libkfaximage.la +%exclude %{_libdir}/libkpovmodeler.la +%exclude %{_libdir}/libkpovmodeler.so.* +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la +# Why ??? +%{_libdir}/libdjvu.so + +%files devel +%defattr(-,root,root,-) +%{_includedir}/kde/* +%{_libdir}/lib*.so +#exclude %{_libdir}/libkpovmodeler.so +%exclude %{_libdir}/libkfaximage.so +%exclude %{_libdir}/libkdeinit_*.so +%exclude %{_libdir}/libdjvu.so + +%changelog +* Sun Sep 11 2011 Francois Andriot - 3.5.13-0 +- Import to GIT From 1b82e4c452ef2606122e70970ae018ab862bbc96 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:21:08 +0200 Subject: [PATCH 11/26] kdeadmin 3.5.13 RPM --- redhat/kdeadmin/ksysvrc | 8 + redhat/kdeadmin/kuser.pam | 3 + redhat/kdeadmin/kuser.pamd | 4 + redhat/kdeadmin/kuserrc | 6 + redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec | 198 +++++++++++++++++++ 5 files changed, 219 insertions(+) create mode 100644 redhat/kdeadmin/ksysvrc create mode 100644 redhat/kdeadmin/kuser.pam create mode 100644 redhat/kdeadmin/kuser.pamd create mode 100644 redhat/kdeadmin/kuserrc create mode 100644 redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec diff --git a/redhat/kdeadmin/ksysvrc b/redhat/kdeadmin/ksysvrc new file mode 100644 index 000000000..48754643d --- /dev/null +++ b/redhat/kdeadmin/ksysvrc @@ -0,0 +1,8 @@ +[Other Settings] +Configured=true +[Path Settings] +RunlevelPath=/etc/rc.d +ScriptPath=/etc/rc.d/init.d +[Runlevels] +Show Runlevels=0,1,2,3,4,5,6 + diff --git a/redhat/kdeadmin/kuser.pam b/redhat/kdeadmin/kuser.pam new file mode 100644 index 000000000..30492636a --- /dev/null +++ b/redhat/kdeadmin/kuser.pam @@ -0,0 +1,3 @@ +USER=root +PROGRAM=/usr/sbin/kuser +SESSION=true diff --git a/redhat/kdeadmin/kuser.pamd b/redhat/kdeadmin/kuser.pamd new file mode 100644 index 000000000..c7d67e332 --- /dev/null +++ b/redhat/kdeadmin/kuser.pamd @@ -0,0 +1,4 @@ +#%PAM-1.0 +auth include config-util +account include config-util +session include config-util diff --git a/redhat/kdeadmin/kuserrc b/redhat/kdeadmin/kuserrc new file mode 100644 index 000000000..baeb5a53b --- /dev/null +++ b/redhat/kdeadmin/kuserrc @@ -0,0 +1,6 @@ +[template] +copySkel=true +createHomeDir=true +homeBase=/home +shell=/bin/bash +userPrivateGroup=true diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec new file mode 100644 index 000000000..3fa5b78a5 --- /dev/null +++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec @@ -0,0 +1,198 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +%define console_helper 1 + +Name: trinity-kdeadmin +Summary: Administrative tools for TDE +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2 +Group: User Interface/Desktops +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: kdeadmin-%{version}.tar.gz +Source1: kuser.pam +Source2: kuser.pamd +Source5: kpackagerc +Source6: ksysvrc +Source7: kuserrc + +Requires: trinity-kdelibs +Requires: pkgconfig +%if 0%{?console_helper} +Requires: usermode-gtk +%endif + +BuildRequires: trinity-kdelibs-devel +BuildRequires: rpm-devel + +%description +The kdeadmin package includes administrative tools for the K Desktop +Environment (KDE) including: +kcron, kdat, knetworkconf, kpackage, ksysv, kuser. + + +%prep +%setup -q -n kdeadmin + +%if 0%{?rhel} > 1 + echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in + echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE ksysv"' >ksysv/configure.in.in + echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kuser"' >kuser/configure.in.in + echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE lilo-config"' >lilo-config/configure.in.in +%endif + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%if 0%{?fedora} > 0 +export CXXFLAGS="${CXXFLAGS} -fpermissive" +%endif + +%configure \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-rpath \ + --with-rpm \ + --enable-final \ + --enable-closure \ + --with-private-groups \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%if 0%{?rhel} > 1 +comps="kcron kdat knetworkconf" +rm -rf %{buildroot}%{_docdir}/HTML/en/kuser \ + %{buildroot}%{_docdir}/HTML/en/kpackage \ + %{buildroot}%{_docdir}/HTML/en/ksysv \ + %{buildroot}%{_docdir}/HTML/en/lilo-config +%else +comps="kcron kdat knetworkconf kpackage ksysv kuser" +mkdir -p %{buildroot}%{_datadir}/config \ + %{buildroot}/etc/security/console.apps \ + %{buildroot}/etc/pam.d \ + %{buildroot}%{_sbindir} + +install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{_datadir}/config/ + +# Run kuser through consolehelper +install -p -m644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser +install -p -m644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser +mv %{buildroot}%{_bindir}/kuser %{buildroot}%{_sbindir} +ln -s consolehelper %{buildroot}%{_bindir}/kuser +%endif + +# locale's +%find_lang %{name} || touch %{name}.lang +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}/$HTML_DIR ]; then +for lang_dir in %{buildroot}/$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common + done + popd + fi +done +fi + +# rpmdocs +for dir in $comps ; do + for file in AUTHORS ChangeLog README TODO ; do + test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" + done +done + +%post +for icon_theme in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun +for icon_theme in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + + +%clean +%__rm -rf %{buildroot} + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING README +%doc rpmdocs/* +%{_bindir}/* +%if 0%{?rhel} < 1 +%{_sbindir}/* +%config(noreplace) /etc/pam.d/* +%config(noreplace) /etc/security/console.apps/* +%{_datadir}/config*/* +%{_datadir}/mimelnk/*/*.desktop +%{_datadir}/icons/crystalsvg/*/*/* +%endif +%{_datadir}/apps/* +%{_datadir}/applications/kde/*.desktop +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* +%{_datadir}/service*/*.desktop +%{tde_libdir}/* +%{_libdir}/pkgconfig/*.pc +%doc %lang(en) %{_docdir}/HTML/en/* + + +%changelog +* Fri Oct 29 2011 Francois Andriot - 3.5.13-0 +- Initial build for RHEL 6 + From ba0e2f33b9bc577ded3fdc305c9b9579445bd7a6 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:22:10 +0200 Subject: [PATCH 12/26] kdelibs, kde-i18n, kdeaccesibility 3.5.13 RPM --- redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec | 1249 +++++++++++++++++ .../trinity-kdeaccessibility-3.5.13.spec | 190 +++ redhat/kdeadmin/kpackagerc | 33 + redhat/kdelibs/trinity-kdelibs-3.5.13.spec~ | 264 ++++ 4 files changed, 1736 insertions(+) create mode 100644 redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec create mode 100644 redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec create mode 100644 redhat/kdeadmin/kpackagerc create mode 100755 redhat/kdelibs/trinity-kdelibs-3.5.13.spec~ diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec new file mode 100644 index 000000000..0fe1bfc89 --- /dev/null +++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec @@ -0,0 +1,1249 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + +# Builds all supported languages (not unsupported ones) +%if "%{?KDE_LANGS}" == "" +%define KDE_LANGS ar bg bn ca cs da de el en_GB es et fi fr he hi hu is it ja lt nl nb nn pa pl pt pt_BR ro ru sk sl sr sv ta tr uk zh_CN zh_TW +%endif + + +Name: trinity-kde-i18n +Summary: Internationalization support for Trinity +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. +License: GFDL +Group: User Interface/Desktops +BuildArch: noarch + +# Speed build options +%define debug_package %{nil} +%define __spec_install_post %{nil} +AutoReq: no + +Source0: kde-i18n-%{version}.tar.gz + +# Patch for 'kdesu': the message was modified in 'kdebase' package +Patch0: kde-i18n-kdesu.patch + +# Patch to translate 'Open Terminal Here' desktop shortcut +Patch1: trinity-kde-i18n-fr-openterminalhere.patch + +BuildRequires: findutils +BuildRequires: gettext +BuildRequires: trinity-arts-devel +BuildRequires: trinity-kdelibs-devel + +%description +%{summary}. + +%package Afrikaans +Summary: Afrikaans(af) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-af = %{version}-%{release} +Requires: kde-filesystem +%description Afrikaans +%{summary}. + +%package Arabic +Summary: Arabic(ar) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-ar = %{version}-%{release} +Requires: kde-filesystem +%description Arabic +%{summary}. + +%package Azerbaijani +Summary: Azerbaijani(az) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-az = %{version}-%{release} +Requires: kde-filesystem +%description Azerbaijani +%{summary}. + +%package Belarusian +Summary: Belarusian(be) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-be = %{version}-%{release} +Requires: kde-filesystem +%description Belarusian +%{summary}. + +%package Bulgarian +Summary: Bulgarian(bg) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-bg = %{version}-%{release} +Requires: kde-filesystem +%description Bulgarian +%{summary}. + +%package Bengali +Summary: Bengali(bn) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-bn = %{version}-%{release} +Requires: kde-filesystem +%description Bengali +%{summary}. + +%package Tibetan +Summary: Tibetan(bo) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-bo = %{version}-%{release} +Requires: kde-filesystem +%description Tibetan +%{summary}. + +%package Breton +Summary: Breton(br) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-br = %{version}-%{release} +Requires: kde-filesystem +%description Breton +%{summary}. + +%package Bosnian +Summary: Bosnian(bs) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-bs = %{version}-%{release} +Requires: kde-filesystem +%description Bosnian +%{summary}. + +%package Catalan +Summary: Catalan(ca) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-ca = %{version}-%{release} +Requires: kde-filesystem +%description Catalan +%{summary}. + +%package Czech +Summary: Czech(cs) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-cs = %{version}-%{release} +Requires: kde-filesystem +%description Czech +%{summary}. + +%package Cymraeg +Summary: Cymraeg language support for KDE3 +Group: User Interface/Desktops +Requires: kde-filesystem +%description Cymraeg +%{summary}. + +%package Welsh +Summary: Welsh(cy) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-cy = %{version}-%{release} +Requires: kde-filesystem +%description Welsh +%{summary}. + +%package Danish +Summary: Danish(da) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-da = %{version}-%{release} +Requires: kde-filesystem +%description Danish +%{summary}. + +%package German +Summary: German(de) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-de = %{version}-%{release} +Requires: kde-filesystem +%description German +%{summary}. + +%package Greek +Summary: Greek(el) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-el = %{version}-%{release} +Requires: kde-filesystem +%description Greek +%{summary}. + +%package British +Summary: British(en_GB) English support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-en_GB = %{version}-%{release} +Requires: kde-filesystem +%description British +%{summary}. + +%package Esperanto +Summary: Esperanto(eo) support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-eo = %{version}-%{release} +Requires: kde-filesystem +%description Esperanto +%{summary}. + +%package Spanish +Summary: Spanish(es) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-es = %{version}-%{release} +Requires: kde-filesystem +%description Spanish +%{summary}. + +%package Estonian +Summary: Estonian(et) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-et = %{version}-%{release} +Requires: kde-filesystem +%description Estonian +%{summary}. + +%package Basque +Summary: Basque(eu) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-eu = %{version}-%{release} +Requires: kde-filesystem +%description Basque +%{summary}. + +%package Farsi +Summary: Farsi(fa) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-fa = %{version}-%{release} +Requires: kde-filesystem +%description Farsi +%{summary}. + +%package Finnish +Summary: Finnish(fi) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-fi = %{version}-%{release} +Requires: kde-filesystem +%description Finnish +%{summary}. + +%package Faroese +Summary: Faroese(fo) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-fo = %{version}-%{release} +Requires: kde-filesystem +%description Faroese +%{summary}. + +%package French +Summary: French(fr) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-fr = %{version}-%{release} +Requires: kde-filesystem +%description French +%{summary}. + +%package Frisian +Summary: Frisian(fy) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-fy = %{version}-%{release} +Requires: kde-filesystem +%description Frisian +%{summary}. + +%package Irish +Summary: Irish(ga) language support for KDE3 +Group: User Interface/Desktops +Obsoletes: kde-i18n-Gaeilge < %{version} +Provides: %{name}-ga = %{version}-%{release} +Requires: kde-filesystem +%description Irish +%{summary}. + +%package Galician +Summary: Galician(gl) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-gl = %{version}-%{release} +Requires: kde-filesystem +%description Galician +%{summary}. + +%package Hebrew +Summary: Hebrew(he) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-he = %{version}-%{release} +Requires: kde-filesystem +%description Hebrew +%{summary}. + +%package Hindi +Summary: Hindi(hi) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-hi = %{version}-%{release} +Requires: kde-filesystem +%description Hindi +%{summary}. + +%package Croatian +Summary: Croatian(hr) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-hr = %{version}-%{release} +Requires: kde-filesystem +%description Croatian +%{summary}. + +%package Hungarian +Summary: Hungarian(hu) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-hu = %{version}-%{release} +Requires: kde-filesystem +%description Hungarian +%{summary}. + +%package Indonesian +Summary: Indonesian(id) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-id = %{version}-%{release} +Requires: kde-filesystem +%description Indonesian +%{summary}. + +%package Icelandic +Summary: Icelandic(is) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-is = %{version}-%{release} +Requires: kde-filesystem +%description Icelandic +%{summary}. + +%package Italian +Summary: Italian(it) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-it = %{version}-%{release} +Requires: kde-filesystem +%description Italian +%{summary}. + +%package Japanese +Summary: Japanese(ja) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-ja = %{version}-%{release} +Requires: kde-filesystem +%description Japanese +%{summary}. + +%package Korean +Summary: Korean(ko) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-ko = %{version}-%{release} +Requires: kde-filesystem +%description Korean +%{summary}. + +%package Kurdish +Summary: Kurdish(ku) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-ku = %{version}-%{release} +Requires: kde-filesystem +%description Kurdish +%{summary}. + +%package Lao +Summary: Lao(lo) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-lo = %{version}-%{release} +Requires: kde-filesystem +%description Lao +%{summary}. + +%package Lithuanian +Summary: Lithuanian(lt) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-lt = %{version}-%{release} +Requires: kde-filesystem +%description Lithuanian +%{summary}. + +%package Latvian +Summary: Latvian(lv) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-lv = %{version}-%{release} +Requires: kde-filesystem +%description Latvian +%{summary}. + +%package Maori +Summary: Maori(mi) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-mi = %{version}-%{release} +Requires: kde-filesystem +%description Maori +%{summary}. + +%package Macedonian +Summary: Macedonian(mk) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-mk = %{version}-%{release} +Requires: kde-filesystem +%description Macedonian +%{summary}. + +%package Maltese +Summary: Maltese(mt) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-mt = %{version}-%{release} +Requires: kde-filesystem +%description Maltese +%{summary}. + +%package Dutch +Summary: Dutch(nl) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-nl = %{version}-%{release} +Requires: kde-filesystem +%description Dutch +%{summary}. + +%package Norwegian +Summary: Norwegian(no) (Bokmaal) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-no = %{version}-%{release} +Requires: kde-filesystem +%description Norwegian +%{summary}. + +%package Norwegian-Nynorsk +Summary: Norwegian(nn) (Nynorsk) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-nn = %{version}-%{release} +Requires: kde-filesystem +%description Norwegian-Nynorsk +%{summary}. + +%package Occitan +Summary: Occitan(oc) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-oc = %{version}-%{release} +Requires: kde-filesystem +%description Occitan +%{summary}. + +%package Polish +Summary: Polish(pl) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-pl = %{version}-%{release} +Requires: kde-filesystem +%description Polish +%{summary}. + +%package Portuguese +Summary: Portuguese(pt) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-pt = %{version}-%{release} +Requires: kde-filesystem +%description Portuguese +%{summary}. + +%package Punjabi +Summary: Punjabi(pa) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-pa = %{version}-%{release} +Requires: kde-filesystem +%description Punjabi +%{summary}. + +%package Brazil +Summary: Brazil(pt_BR) Portuguese language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-pt_BR = %{version}-%{release} +Requires: kde-filesystem +%description Brazil +%{summary}. + +%package Romanian +Summary: Romanian(ro) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-ro = %{version}-%{release} +Requires: kde-filesystem +%description Romanian +%{summary}. + +%package Russian +Summary: Russian(ru) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-ru = %{version}-%{release} +Requires: kde-filesystem +%description Russian +%{summary}. + +%package Slovak +Summary: Slovak(sk) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-sk = %{version}-%{release} +Requires: kde-filesystem +%description Slovak +%{summary}. + +%package Slovenian +Summary: Slovenian(sl) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-sl = %{version}-%{release} +Requires: kde-filesystem +%description Slovenian +%{summary}. + +%package Serbian +Summary: Serbian(sr) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-sr = %{version}-%{release} +Requires: kde-filesystem +%description Serbian +%{summary}. + +%package Swedish +Summary: Swedish(sv) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-sv = %{version}-%{release} +Requires: kde-filesystem +%description Swedish +%{summary}. + +%package Tamil +Summary: Tamil(ta) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-ta = %{version}-%{release} +Requires: kde-filesystem +%description Tamil +%{summary}. + +%package Tajik +Summary: Tajik(tg) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-tg = %{version}-%{release} +Requires: kde-filesystem +%description Tajik +%{summary}. + +%package Thai +Summary: Thai(th) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-th = %{version}-%{release} +Requires: kde-filesystem +%description Thai +%{summary}. + +%package Turkish +Summary: Turkish(tr) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-tr = %{version}-%{release} +Requires: kde-filesystem +%description Turkish +%{summary}. + +%package Ukrainian +Summary: Ukrainian(uk) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-uk = %{version}-%{release} +Requires: kde-filesystem +%description Ukrainian +%{summary}. + +%package Venda +Summary: Venda(ven) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-ven = %{version}-%{release} +Requires: kde-filesystem +%description Venda +%{summary}. + +%package Vietnamese +Summary: Vietnamese(vi) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-vi = %{version}-%{release} +Requires: kde-filesystem +%description Vietnamese +%{summary}. + +%package Walloon +Summary: Walloon(wa) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-wa = %{version}-%{release} +Requires: kde-filesystem +%description Walloon +%{summary}. + +%package Xhosa +Summary: Xhosa(xh) (a Bantu language) support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-xh = %{version}-%{release} +Requires: kde-filesystem +%description Xhosa +%{summary}. + +%package Chinese +Summary: Chinese(zh_CN) (Simplified Chinese) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-zh_CN = %{version}-%{release} +Requires: kde-filesystem +%description Chinese +%{summary}. + +%package Chinese-Big5 +Summary: Chinese(zh_TW) (Big5) language support for KDE3 +Group: User Interface/Desktops +Provides: %{name}-tz_TW = %{version}-%{release} +Requires: kde-filesystem +%description Chinese-Big5 +%{summary}. + + + +%prep +%setup -q -n kde-i18n + +for l in %{KDE_LANGS}; do + for f in kde-i18n-${l}-*.tar.bz2; do + tar xjf ${f} + done +done + +%patch0 +%patch1 + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +for l in %{KDE_LANGS}; do + for f in kde-i18n-${l}-*/; do + if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then + pushd ${f} + %configure --prefix=%{_prefix} + %{__make} %{?_smp_mflags} + popd + fi + done +done + +%install +rm -rf %{?buildroot} +export PATH="%{_bindir}:${PATH}" + +for l in %{KDE_LANGS}; do + for f in kde-i18n-${l}-*/; do + if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then + pushd ${f} + + # Thales: dirty hack to remove directory 'common' from install list (else it fails to install) + if [ -r docs/Makefile ]; then + sed -i docs/Makefile -e "s,^\(SUBDIRS =.*\)common\(.*\)$,\1 \2," + fi + + %__make install DESTDIR=%{?buildroot} + popd + fi + done +done + +# make symlinks relative +pushd %{buildroot}%{_docdir}/HTML +for lang in *; do + if [ -d $lang ]; then + pushd $lang + for i in */*/*; do + if [ -d $i -a -L $i/common ]; then + rm -f $i/common + ln -sf ../../../docs/common $i + fi + done + + for i in */*; do + if [ -d $i -a -L $i/common ]; then + rm -f $i/common + ln -sf ../../docs/common $i + fi + done + + for i in *; do + if [ -d $i -a -L $i/common ]; then + rm -f $i/common + ln -sf ../docs/common $i + fi + done + + popd + fi +done +popd + +# remove zero-length file +find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; + +# See http://fedoraproject.org/wiki/Languages (???) +rm -f %{buildroot}%{_datadir}/locale/*/flag.png +# And also the 'desktop.entry' (???) +rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop + +# remove obsolete KDE 3 application data translations +rm -rf %{buildroot}%{_datadir}/apps + +%clean +rm -rf %{buildroot} + +%if "%( grep -w af <<< '%{KDE_LANGS}' )" != "" +%files Afrikaans +%defattr(-,root,root,-) +%lang(af) %{_datadir}/locale/af/LC_MESSAGES/* +%lang(af) %{_datadir}/locale/af/charset +%lang(af) %{_docdir}/HTML/af/ +%endif + +%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != "" +%files Arabic +%defattr(-,root,root,-) +%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/* +%lang(ar) %{_datadir}/locale/ar/charset +%endif + +%if "%( grep -w az <<< '%{KDE_LANGS}' )" != "" +%files Azerbaijani +%defattr(-,root,root,-) +%lang(az) %{_datadir}/locale/az/LC_MESSAGES/* +%lang(az) %{_datadir}/locale/az/charset +%endif + +%if "%( grep -w be <<< '%{KDE_LANGS}' )" != "" +%files Belarusian +%defattr(-,root,root,-) +%lang(be) %{_datadir}/locale/be/LC_MESSAGES/* +%lang(be) %{_datadir}/locale/be/charset +%endif + +%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != "" +%files Bulgarian +%defattr(-,root,root,-) +%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/* +%lang(bg) %{_datadir}/locale/bg/charset +%endif + +%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != "" +%files Bengali +%defattr(-,root,root,-) +%lang(bn) %{_datadir}/locale/bn/LC_MESSAGES/* +%lang(bn) %{_datadir}/locale/bn/charset +%endif + +%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != "" +%files Tibetan +%defattr(-,root,root,-) +%lang(bo) %{_datadir}/locale/bo/LC_MESSAGES/* +%lang(bo) %{_datadir}/locale/bo/charset +%endif + +%if "%( grep -w br <<< '%{KDE_LANGS}' )" != "" +%files Breton +%defattr(-,root,root,-) +%lang(br) %{_datadir}/locale/br/LC_MESSAGES/* +%lang(br) %{_datadir}/locale/br/charset +%endif + +%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != "" +%files Bosnian +%defattr(-,root,root,-) +%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/* +%lang(bs) %{_datadir}/locale/bs/charset +%endif + +%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != "" +%files Catalan +%defattr(-,root,root,-) +%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/* +%lang(ca) %{_datadir}/locale/ca/charset +%lang(ca) %{_docdir}/HTML/ca/ +%endif + +%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != "" +%files Czech +%defattr(-,root,root,-) +%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/* +%lang(cs) %{_datadir}/locale/cs/charset +%lang(cs) %{_docdir}/HTML/cs/ +%endif + +%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != "" +%files Welsh +%defattr(-,root,root,-) +%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/* +%lang(cy) %{_datadir}/locale/cy/charset +%endif + +%if "%( grep -w da <<< '%{KDE_LANGS}' )" != "" +%files Danish +%defattr(-,root,root,-) +%lang(da) %{_datadir}/locale/da/LC_MESSAGES/* +%lang(da) %{_datadir}/locale/da/charset +%lang(da) %{_datadir}/locale/da/da.compendium +%lang(da) %{_docdir}/HTML/da/ +%endif + +%if "%( grep -w de <<< '%{KDE_LANGS}' )" != "" +%files German +%defattr(-,root,root,-) +%lang(de) %{_datadir}/locale/de/LC_MESSAGES/* +%lang(de) %{_datadir}/locale/de/charset +%lang(de) %{_docdir}/HTML/de/ +%endif + +%if "%( grep -w el <<< '%{KDE_LANGS}' )" != "" +%files Greek +%defattr(-,root,root,-) +%lang(el) %{_datadir}/locale/el/LC_MESSAGES/* +%lang(el) %{_datadir}/locale/el/charset +%endif + +%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != "" +%files British +%defattr(-,root,root,-) +%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/* +%lang(en_GB) %{_datadir}/locale/en_GB/charset +%lang(en_GB) %{_docdir}/HTML/en_GB/ +%endif + +%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != "" +%files Esperanto +%defattr(-,root,root,-) +%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/* +%lang(eo) %{_datadir}/locale/eo/charset +%endif + +%if "%( grep -w es <<< '%{KDE_LANGS}' )" != "" +%files Spanish +%defattr(-,root,root,-) +%lang(es) %{_datadir}/locale/es/LC_MESSAGES/* +%lang(es) %{_datadir}/locale/es/charset +%lang(es) %{_docdir}/HTML/es/ +%endif + +%if "%( grep -w et <<< '%{KDE_LANGS}' )" != "" +%files Estonian +%defattr(-,root,root,-) +%lang(et) %{_datadir}/locale/et/LC_MESSAGES/* +%lang(et) %{_datadir}/locale/et/charset +%lang(et) %{_docdir}/HTML/et/ +%endif + +%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != "" +%files Basque +%defattr(-,root,root,-) +%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/* +%lang(eu) %{_datadir}/locale/eu/charset +%endif + +%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != "" +%files Farsi +%defattr(-,root,root,-) +%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/* +%lang(fa) %{_datadir}/locale/fa/charset +%endif + +%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != "" +%files Finnish +%defattr(-,root,root,-) +%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/* +%lang(fi) %{_datadir}/locale/fi/charset +%lang(fi) %{_docdir}/HTML/fi/ +%endif + +%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != "" +%files Faroese +%defattr(-,root,root,-) +%lang(fo) %{_datadir}/locale/fo/LC_MESSAGES/* +%lang(fo) %{_datadir}/locale/fo/charset +%endif + +%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != "" +%files French +%defattr(-,root,root,-) +%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/* +%lang(fr) %{_datadir}/locale/fr/charset +%lang(fr) %{_datadir}/locale/fr/nbsp_gui_fr.txt +%lang(fr) %{_datadir}/locale/fr/relecture_* +%lang(fr) %{_docdir}/HTML/fr/ +%endif + +%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != "" +%files Frisian +%defattr(-,root,root,-) +%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/* +%lang(fy) %{_datadir}/locale/fy/charset +%endif + +%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != "" +%files Irish +%defattr(-,root,root,-) +%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/* +%lang(ga) %{_datadir}/locale/ga/charset +%endif + +%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != "" +%files Galician +%defattr(-,root,root,-) +%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/* +%lang(gl) %{_datadir}/locale/gl/charset +%endif + +%if "%( grep -w he <<< '%{KDE_LANGS}' )" != "" +%files Hebrew +%defattr(-,root,root,-) +%lang(he) %{_datadir}/locale/he/LC_MESSAGES/* +%lang(he) %{_datadir}/locale/he/charset +%lang(he) %{_docdir}/HTML/he/ +%endif + +%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != "" +%files Hindi +%defattr(-,root,root,-) +%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/* +%lang(hi) %{_datadir}/locale/hi/charset +%endif + +%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != "" +%files Croatian +%defattr(-,root,root,-) +%lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/* +%lang(hr) %{_datadir}/locale/hr/charset +%lang(hr) %{_docdir}/HTML/hr/ +%endif + +%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != "" +%files Hungarian +%defattr(-,root,root,-) +%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/* +%lang(hu) %{_datadir}/locale/hu/charset +%lang(hu) %{_docdir}/HTML/hu/ +%endif + +%if "%( grep -w id <<< '%{KDE_LANGS}' )" != "" +%files Indonesian +%defattr(-,root,root,-) +%lang(id) %{_datadir}/locale/id/LC_MESSAGES/* +%lang(id) %{_datadir}/locale/id/charset +%lang(id) %{_docdir}/HTML/id/ +%endif + +%if "%( grep -w is <<< '%{KDE_LANGS}' )" != "" +%files Icelandic +%defattr(-,root,root,-) +%lang(is) %{_datadir}/locale/is/LC_MESSAGES/* +%lang(is) %{_datadir}/locale/is/charset +%endif + +%if "%( grep -w it <<< '%{KDE_LANGS}' )" != "" +%files Italian +%defattr(-,root,root,-) +%lang(it) %{_datadir}/locale/it/LC_MESSAGES/* +%lang(it) %{_datadir}/locale/it/charset +%lang(it) %{_docdir}/HTML/it/ +%endif + +%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != "" +%files Japanese +%defattr(-,root,root,-) +%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/* +%lang(ja) %{_datadir}/locale/ja/charset +%lang(ja) %{_docdir}/HTML/ja/ +%endif + +%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != "" +%files Korean +%defattr(-,root,root,-) +%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/* +%lang(ko) %{_datadir}/locale/ko/charset +%lang(ko) %{_docdir}/HTML/ko/ +%endif + +%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != "" +%files Kurdish +%defattr(-,root,root,-) +%lang(ku) %{_datadir}/locale/ku/LC_MESSAGES/* +%lang(ku) %{_datadir}/locale/ku/charset +%lang(ku) %{_docdir}/HTML/ku/ +%endif + +%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != "" +%files Lao +%defattr(-,root,root,-) +%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/* +%lang(lo) %{_datadir}/locale/lo/charset +%lang(lo) %{_docdir}/HTML/lo/ +%endif + +%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != "" +%files Lithuanian +%defattr(-,root,root,-) +%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/* +%lang(lt) %{_datadir}/locale/lt/charset +%endif + +%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != "" +%files Latvian +%defattr(-,root,root,-) +%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/* +%lang(lv) %{_datadir}/locale/lv/charset +%endif + +%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != "" +%files Maori +%defattr(-,root,root,-) +%lang(mi) %{_datadir}/locale/mi/LC_MESSAGES/* +%lang(mi) %{_datadir}/locale/mi/charset +%endif + +%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != "" +%files Macedonian +%defattr(-,root,root,-) +%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/* +%lang(mk) %{_datadir}/locale/mk/charset +%endif + +%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != "" +%files Maltese +%defattr(-,root,root,-) +%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/* +%lang(mt) %{_datadir}/locale/mt/charset +%endif + +%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != "" +%files Dutch +%defattr(-,root,root,-) +%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/* +%lang(nl) %{_datadir}/locale/nl/charset +%lang(nl) %{_docdir}/HTML/nl/ +%endif + +%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != "" +%files Norwegian +%defattr(-,root,root,-) +%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/* +%lang(nb) %{_datadir}/locale/nb/charset +%lang(nb) %{_datadir}/locale/nb/README +#%lang(nb) %{_docdir}/HTML/nb/ +%endif + +%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != "" +%files Norwegian-Nynorsk +%defattr(-,root,root,-) +%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/* +%lang(nn) %{_datadir}/locale/nn/charset +#%lang(nn) %{_docdir}/HTML/nn/ +%endif + +%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != "" +%files Occitan +%defattr(-,root,root,-) +%lang(oc) %{_datadir}/locale/oc/LC_MESSAGES/* +%lang(oc) %{_datadir}/locale/oc/charset +%endif + +%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != "" +%files Punjabi +%defattr(-,root,root,-) +%lang(pa) %{_datadir}/locale/pa/LC_MESSAGES/* +%lang(pa) %{_datadir}/locale/pa/charset +%endif + +%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != "" +%files Polish +%defattr(-,root,root,-) +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/* +%lang(pl) %{_datadir}/locale/pl/charset +%lang(pl) %{_docdir}/HTML/pl/ +%endif + +%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != "" +%files Portuguese +%defattr(-,root,root,-) +%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/* +%lang(pt) %{_datadir}/locale/pt/charset +%lang(pt) %{_docdir}/HTML/pt/ +%endif + +%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != "" +%files Brazil +%defattr(-,root,root,-) +%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/* +%lang(pt_BR) %{_datadir}/locale/pt_BR/charset +%lang(pt_BR) %{_docdir}/HTML/pt_BR/ +%endif + +%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != "" +%files Romanian +%defattr(-,root,root,-) +%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/* +%lang(ro) %{_datadir}/locale/ro/charset +%lang(ro) %{_docdir}/HTML/ro/ +%endif + +%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != "" +%files Russian +%defattr(-,root,root,-) +%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/* +%lang(ru) %{_datadir}/locale/ru/charset +%lang(ru) %{_docdir}/HTML/ru/ +%endif + +%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != "" +%files Slovak +%defattr(-,root,root,-) +%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/* +%lang(sk) %{_datadir}/locale/sk/charset +%lang(sk) %{_docdir}/HTML/sk/ +%endif + +%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != "" +%files Slovenian +%defattr(-,root,root,-) +%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/* +%lang(sl) %{_datadir}/locale/sl/charset +%lang(sl) %{_docdir}/HTML/sl/ +%endif + +%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != "" +%files Serbian +%defattr(-,root,root,-) +%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/* +%lang(sr) %{_datadir}/locale/sr/charset +%lang(sr) %{_docdir}/HTML/sr/ +%endif + +%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != "" +%files Swedish +%defattr(-,root,root,-) +%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/* +%lang(sv) %{_datadir}/locale/sv/charset +%lang(sv) %{_docdir}/HTML/sv/ +%endif + +%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != "" +%files Tamil +%defattr(-,root,root,-) +%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/* +%lang(ta) %{_datadir}/locale/ta/charset +%endif + +%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != "" +%files Tajik +%defattr(-,root,root,-) +%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/* +%lang(tg) %{_datadir}/locale/tg/charset +%endif + +%if "%( grep -w th <<< '%{KDE_LANGS}' )" != "" +%files Thai +%defattr(-,root,root,-) +%lang(th) %{_datadir}/locale/th/LC_MESSAGES/* +%lang(th) %{_datadir}/locale/th/charset +%endif + +%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != "" +%files Turkish +%defattr(-,root,root,-) +%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/* +%lang(tr) %{_datadir}/locale/tr/charset +%lang(tr) %{_docdir}/HTML/tr/ +%endif + +%if "%( grep -w uk <<< '%{KDE_LANGS}' )" != "" +%files Ukrainian +%defattr(-,root,root,-) +%lang(uk) %{_docdir}/HTML/uk/ +%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/* +%lang(uk) %{_datadir}/locale/uk/charset +%endif + +%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != "" +%files Venda +%defattr(-,root,root,-) +%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/* +%lang(ven) %{_datadir}/locale/ven/charset +%endif + +%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != "" +%files Vietnamese +%defattr(-,root,root,-) +%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/* +%lang(vi) %{_datadir}/locale/vi/charset +%endif + +%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != "" +%files Walloon +%defattr(-,root,root,-) +%lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/* +%lang(wa) %{_datadir}/locale/wa/charset +%endif + +%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != "" +%files Xhosa +%defattr(-,root,root,-) +%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/* +%lang(xh) %{_datadir}/locale/xh/charset +%lang(xh) %{_docdir}/HTML/xh/ +%endif + +%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != "" +%files Chinese +%defattr(-,root,root,-) +%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/* +%lang(zh_CN) %{_datadir}/locale/zh_CN/charset +%lang(zh_CN) %{_docdir}/HTML/zh_CN/ +%endif + +%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != "" +%files Chinese-Big5 +%defattr(-,root,root,-) +%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/* +%lang(zh_TW) %{_datadir}/locale/zh_TW/charset +%lang(zh_TW) %{_docdir}/HTML/zh_TW/ +%endif + +%changelog +* Mon Sep 19 2011 Francois Andriot - 3.5.12-7 +- Add support for RHEL5 + +* Sun Sep 11 2011 Francois Andriot - 3.5.12-6 +- Re-introduce all languages + +* Wed Aug 24 2011 Francois Andriot - 3.5.12-5 +- Re-introduce all languages + +* Mon Aug 22 2011 Francois Andriot - 3.5.12-4 +- Correct macro to install under "/opt", if desired + +* Thu Jul 21 2011 Francois Andriot - 3.5.12-3 +- Add 'Patch1': translation for 'Open Terminal Here...' background shortcut + +* Sun Dec 19 2010 Francois Andriot - 3.5.12-2 +- Rebuilt + +* Sun Dec 19 2010 Francois Andriot - 3.5.12-0 +- Initial version (French language only) +- Based on RHEL SPEC file 'kde-i18n' +- Add 'patch0' to reflect modifications in 'kdesu' from 'kdebase' package + diff --git a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec new file mode 100644 index 000000000..e582df583 --- /dev/null +++ b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec @@ -0,0 +1,190 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Summary: K Desktop Environment - Accessibility +Name: trinity-kdeaccessibility +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2 +Group: User Interface/Desktops + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Source0: kdeaccessibility-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + +Provides: kdeaccessibility3 = %{version}-%{release} + +Requires: trinity-kdelibs +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +BuildRequires: desktop-file-utils +BuildRequires: trinity-kdelibs-devel +BuildRequires: alsa-lib-devel +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 +BuildRequires: libXtst-devel +%endif + +%description +Included with this package are: +* kmag, a screen magnifier, +* kmousetool, a program for people whom it hurts to click the mouse, +* kmouth, program that allows people who have lost their voice + to let their computer speak for them. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Provides: kdeaccessibility3-devel = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Requires: trinity-kdelibs-devel +%description devel +%{summary}. + + +%prep +%setup -q -n kdeaccessibility + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --includedir=%{tde_includedir} \ + --disable-rpath \ + --enable-new-ldflags \ + --enable-closure \ + --disable-debug --disable-warnings \ + --enable-final \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +desktop-file-install \ + --vendor="" \ + --dir %{buildroot}%{_datadir}/applications/kde \ + --delete-original \ + %{buildroot}%{_datadir}/applnk/Applications/*.desktop ||: + +# file lists for locale +%find_lang %{name} || touch %{name}.lang +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}/$HTML_DIR ]; then + for lang_dir in %{buildroot}/$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common + done + popd + fi + done +fi + +# rpmdocs +for dir in kmag kmousetool ksayit kttsd ; do + for file in AUTHORS ChangeLog README TODO ; do + test -s $dir/$file && install -p -m644 -D $dir/$file rpmdocs/$dir/$file + done +done + + + +%clean +%__rm -rf %{buildroot} + + +%post +/sbin/ldconfig ||: +for icon_theme in mono hicolor locolor ; do + touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun +/sbin/ldconfig ||: +for icon_theme in mono hicolor locolor ; do + touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc COPYING +%doc rpmdocs/* +%{_bindir}/* +%{_datadir}/applications/kde/*.desktop +%{_datadir}/apps/*/ +%{_datadir}/config/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* +%{_datadir}/icons/mono/ +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/service*/*.desktop +%{_libdir}/lib*.so.* +%{_libdir}/*.la +%{tde_libdir}/* + +# Misc docs +%doc %lang(en) %{_docdir}/HTML/en/kmag +%doc %lang(en) %{_docdir}/HTML/en/kmousetool +%doc %lang(en) %{_docdir}/HTML/en/kmouth +%doc %lang(en) %{_docdir}/HTML/en/kttsd + + +%files devel +%defattr(-,root,root,-) +%{tde_includedir}/* +%{_libdir}/lib*.so + + +%changelog +* Sun Sep 11 2011 Francois Andriot - 3.5.13-0 +- Initial build for RHEL 6 +- Spec file based on Fedora 8 "kdeaccessibility-3.5.10-1" +- Import to GIT diff --git a/redhat/kdeadmin/kpackagerc b/redhat/kdeadmin/kpackagerc new file mode 100644 index 000000000..72be06d46 --- /dev/null +++ b/redhat/kdeadmin/kpackagerc @@ -0,0 +1,33 @@ +[Kpackage] +BSD=false +DEBAPT=false +DEBDPKG=false +KISS=false +RPM=true +SLACK=false + +[Rpm] +Package_L_0_0=/mnt/cdrom/RedHat/RPMS +Package_L_0_1=/mnt/cdrom/SRPMS +Package_L_0_2=/usr/src/redhat/RPMS +Package_L_0_3=/usr/src/redhat/SRPMS +Package_L_0_4=ftp://ftp.redhat.com/pub/redhat/linux/updates/7.2/en +Package_L_1_0=ftp://rhcontrib.bero.org/pub/rh-contrib/7.2/i386 +Package_L_1_1=ftp://rhcontrib.bero.org/pub/rh-contrib/7.2/noarch +Package_L_1_2=ftp://rhcontrib.bero.org/pub/rh-contrib/7.2/SRPMS +Package_S_0_0=0 +Package_S_0_1=0 +Package_S_0_2=1 +Package_S_0_3=0 +Package_S_0_4=1 +Package_S_1_0=0 +Package_S_1_1=0 +Package_S_1_2=0 +Package_U_0_0=1 +Pacakge_U_0_1=1 +Package_U_0_2=1 +Pacakge_U_0_3=1 +Package_U_0_4=0 +Package_U_1_0=0 +Package_U_1_1=0 +Package_U_1_2=0 diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec~ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec~ new file mode 100755 index 000000000..4b98b33f9 --- /dev/null +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec~ @@ -0,0 +1,264 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific variables +BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-kdelibs +Version: %{version} +Release: %{?release}%{?dist}%{?_variant} +License: GPL +Summary: Trinity KDE Libraries + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Source0: kdelibs-%{version}.tar.gz +Prefix: %{_prefix} + +BuildRequires: libtool +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: qt3-devel +BuildRequires: avahi-devel avahi-qt3-devel +#BuildRequires: lua-devel +BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel +BuildRequires: libutempter-devel +BuildRequires: bzip2-devel +BuildRequires: openssl-devel + +Requires: tqtinterface +Requires: trinity-arts +Requires: qt3 +Requires: avahi avahi-qt3 + +%if "%{?_prefix}" == "/usr" +Obsoletes: kdelibs3 +%endif + +%description +Libraries for the Trinity K Desktop Environment + +%package devel +Requires: %{name} +Summary: %{name} - Development files +%if "%{?_prefix}" == "/usr" +Obsoletes: kdelibs3-devel +%endif + +%description devel +Development files for %{name} + +%package apidocs +Requires: %{name} +Summary: %{name} - API documentation + +%description apidocs +This package includes the KDE 3 API documentation in HTML +format for easy browsing + +%prep +%setup -q -n kdelibs + +# Gets the cmake modules in current build directory +%__mkdir_p cmake/modules +%__cp -f %{_datadir}/cmake/*.* cmake/modules + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LD_LIBRARY_PATH="%{_libdir}" +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" + +%__mkdir build +cd build +%cmake \ + -DWITH_ARTS=ON \ + -DWITH_ALSA=ON \ + -DWITH_LIBART=ON \ + -DWITH_LIBIDN=OFF \ + -DWITH_SSL=ON \ + -DWITH_CUPS=ON \ + -DWITH_LUA=OFF \ + -DWITH_TIFF=ON \ + -DWITH_JASPER=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_UTEMPTER=ON \ + -DWITH_AVAHI=ON \ + -DWITH_ASPELL=OFF \ + -DWITH_HSPELL=OFF \ + .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot} +%make_install -C build + +%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d +cat <%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf +%if "%{?_prefix}" != "/usr" +%{_libdir} +%endif +%{_libdir}/trinity +EOF + +%clean +%__rm -rf %{?buildroot} + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc README +%doc COPYING.LIB +%{_bindir}/artsmessage +%{_bindir}/cupsdconf +%{_bindir}/cupsdoprint +%{_bindir}/dcop +%{_bindir}/dcopclient +%{_bindir}/dcopfind +%{_bindir}/dcopobject +%{_bindir}/dcopquit +%{_bindir}/dcopref +%{_bindir}/dcopserver +%{_bindir}/dcopserver_shutdown +%{_bindir}/dcopstart +%{_bindir}/filesharelist +%{_bindir}/fileshareset +%{_bindir}/imagetops +%{_bindir}/kab2kabc +%{_bindir}/kaddprinterwizard +%{_bindir}/kbuildsycoca +%{_bindir}/kcmshell +%{_bindir}/kconf_update +%{_bindir}/kcookiejar +%{_bindir}/kde-config +%{_bindir}/kde-menu +%{_bindir}/kded +%{_bindir}/kdeinit +%{_bindir}/kdeinit_shutdown +%{_bindir}/kdeinit_wrapper +%{_bindir}/kdesu_stub +%{_bindir}/kdontchangethehostname +%{_bindir}/kdostartupconfig +%{_bindir}/kfile +%{_bindir}/kfmexec +%{_bindir}/khotnewstuff +%{_bindir}/kinstalltheme +%{_bindir}/kio_http_cache_cleaner +%{_bindir}/kio_uiserver +%{_bindir}/kioexec +%{_bindir}/kioslave +%{_bindir}/klauncher +%{_bindir}/kmailservice +%{_bindir}/kmimelist +%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper +%{_bindir}/ksendbugmail +%{_bindir}/kshell +%{_bindir}/kstartupconfig +%{_bindir}/ktelnetservice +%{_bindir}/ktradertest +%{_bindir}/kwrapper +%{_bindir}/lnusertemp +%{_bindir}/make_driver_db_cups +%{_bindir}/make_driver_db_lpr +%{_bindir}/meinproc +%{_bindir}/networkstatustestservice +%{_bindir}/start_kdeinit +%{_bindir}/start_kdeinit_wrapper +%attr(4755,root,root) %{_bindir}/kgrantpty +%{_libdir}/lib*.so.* +%{_libdir}/libkdeinit_*.so +%{_libdir}/lib*.la +%{tde_libdir}/ +%{_datadir}/applications/kde/*.desktop +%{_datadir}/autostart/kab2kabc.desktop +%{_datadir}/applnk/kio_iso.desktop +%{_datadir}/apps/* +%exclude %{_datadir}/apps/ksgmltools2/ +%config(noreplace) %{_datadir}/config/* +%{_datadir}/emoticons/* +%{_datadir}/icons/default.kde +%{_datadir}/mimelnk/magic +%{_datadir}/mimelnk/*/*.desktop +%{_datadir}/services/* +%{_datadir}/servicetypes/* +%{_datadir}/icons/crystalsvg/ +%{tde_docdir}/HTML/en/kspell +# remove conflicts with kdelibs-4 +%if "%{?_prefix}" != "/usr" +%{_bindir}/checkXML +%{_bindir}/ksvgtopng +%{_bindir}/kunittestmodrunner +%{_bindir}/preparetips +%{_datadir}/icons/hicolor/index.theme +%{_datadir}/locale/all_languages +%{tde_docdir}/HTML/en/common/* +%else +%exclude %{_bindir}/checkXML +%exclude %{_bindir}/ksvgtopng +%exclude %{_bindir}/kunittestmodrunner +%exclude %{_bindir}/preparetips +%exclude %{_datadir}/config/colors +%exclude %{_datadir}/config/kdebug.areas +%exclude %{_datadir}/config/kdebugrc +%exclude %{_datadir}/config/ksslcalist +%exclude %{_datadir}/config/ui/ui_standards.rc +%exclude %{_datadir}/icons/hicolor/index.theme +%exclude %{_datadir}/locale/all_languages +%exclude %{tde_docdir}/HTML/en/common/* +%endif +%{_sysconfdir}/ld.so.conf.d/trinity.conf + +# Provided by 'redhat-menus' package +%exclude %{_sysconfdir}/xdg/menus/applications.menu + +# New in TDE 3.5.13 +%{_bindir}/kdetcompmgr + +%files devel +%defattr(-,root,root,-) +%{_bindir}/dcopidl* +%{_bindir}/kconfig_compiler +%{_bindir}/makekdewidgets +%{_datadir}/apps/ksgmltools2/ +%{_includedir}/ +%{_libdir}/lib*.so +%{_libdir}/lib*.a +%exclude %{_libdir}/libkdeinit_*.so + +# New in TDE 3.5.13 +%{_datadir}/cmake/kdelibs.cmake + +%files apidocs +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version}/ +#%{tde_docdir}/HTML/en/kdelibs* + + +%changelog +* Wed Sep 02 2011 Francois Andriot - 3.5.13pre.svn20110902-0.el6 +- Import to GIT +- Built with future TDE version (3.5.13 + cmake + QT3.3.8d) From 6f9f02b9b034466bd21bc3863d90f8dcf8502850 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:22:41 +0200 Subject: [PATCH 13/26] kdebase 3.5.12 fix --- redhat/kdebase/trinity-kdebase-3.5.12.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec index b3df6b097..f060b3c44 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.12.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.12 %endif -%define release 11 +%define release 12 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -51,6 +51,8 @@ Patch4: http://www.trinitydesktop.org/patches/r1182808.diff # [kdebase] fixed an incompatibility with gcc 4.5 Patch8: http://www.trinitydesktop.org/patches/r1221326.diff +Patch11: kdebase-3.5.12-kickerfix.patch + # TDE Official patches (from SVN), modified # [kdebase/ksmserver/shutdowndlg.cpp] Fixed invalid constructor per GCC 4.5.2 Patch7: kdebase-3.5.12-r1220975.patch @@ -185,6 +187,7 @@ Protocol handlers (KIOslaves) for personal information management, including: %if 0%{?rhel} && 0%{?rhel} < 6 %patch10 -p1 %endif +%patch11 -d kicker/kicker %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" From 5a3c8c66709ef8eeb3708b0eb2732fa9e84d37d3 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:22:57 +0200 Subject: [PATCH 14/26] kdeaddons 3.5.13 RPM --- redhat/kdeaddons/metabar-fedora.tar.bz2 | Bin 0 -> 143074 bytes redhat/kdeaddons/metabarrc | 7 + redhat/kdeaddons/svn.patch | Bin 0 -> 252 bytes .../kdeaddons/trinity-kdeaddons-3.5.13.spec | 257 ++++++++++++++++++ 4 files changed, 264 insertions(+) create mode 100644 redhat/kdeaddons/metabar-fedora.tar.bz2 create mode 100644 redhat/kdeaddons/metabarrc create mode 100644 redhat/kdeaddons/svn.patch create mode 100644 redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec diff --git a/redhat/kdeaddons/metabar-fedora.tar.bz2 b/redhat/kdeaddons/metabar-fedora.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..8a0cde35d46e9b81e3cd0c045fca5faaf5cf5dea GIT binary patch literal 143074 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

gsVKKhAKpMW8 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≀qD%(*7SVT6Q$Cmiz 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 literal 0 HcmV?d00001 diff --git a/redhat/kdeaddons/metabarrc b/redhat/kdeaddons/metabarrc new file mode 100644 index 000000000..7eb9a453b --- /dev/null +++ b/redhat/kdeaddons/metabarrc @@ -0,0 +1,7 @@ +[General] +AnimateResize=false +MaxActions=3 +MaxEntries=3 +ShowFrame=true +ShowServicemenus=true +Theme=fedora diff --git a/redhat/kdeaddons/svn.patch b/redhat/kdeaddons/svn.patch new file mode 100644 index 0000000000000000000000000000000000000000..10fb2d8f688da647ae7c3122e3041058a744a4f5 GIT binary patch literal 252 zcmb8ny$*sf7=>Y1dlg?;Yum3>ek8_pb<#My5L&Q-R6;R^yYXJUF)=#2xSTgR!^0Q@ zE?Q$tW3E1k*4uj+UDeuwg=%p97(_i;9~wLIe&UDIei@^bOd?YV5{oq!G4f5OvQ)_= z0g4ilP)h%Cf0#Ls(|k5DS6@?WV0pS)1D#ia)&#a<2w_JciXsApEyx*;WdLKLcK)5t THQvJW0bTjIZgZ-OvjZnDI7&wA literal 0 HcmV?d00001 diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec new file mode 100644 index 000000000..d5cb516b9 --- /dev/null +++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec @@ -0,0 +1,257 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-kdeaddons +Summary: Trinity Desktop Environment - Plugins +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2 +Group: User Interface/Desktops + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: kdeaddons-%{version}.tar.gz +Source1: metabar-fedora.tar.bz2 +Source2: metabarrc + +Patch3: kdeaddons-3.5.3-sdl.patch + +Patch100: svn.patch + +BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-kdegames-devel +BuildRequires: trinity-kdemultimedia-devel +BuildRequires: trinity-kdepim-devel +BuildRequires: SDL-devel +BuildRequires: alsa-lib-devel +BuildRequires: openssl-devel +BuildRequires: db4-devel +BuildRequires: xmms-devel + +Requires: trinity-kdebase +%if 0%{?fedora} +# used in jpegorient (#312641) +Requires: python-exif +%endif +Requires: which + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +Obsoletes: %{name}-xmms < %{version}-%{release} + +%description +A collection of KDE Addons/Plugins, including: +* konq-plugins: akregator, babelfish, domtreeviewer, imagerotation, validators, webarchiver +* kate (plugins) +* kicker-applets: kbinaryclock, kolourpicker, ktimemon, mediacontrol +* knewsticker-scripts + +%package extras +Group: User Interface/Desktops +Summary: Extras packages from kdeaddons +Requires: %{name} = %{version}-%{release} +Requires: trinity-kdegames +Obsoletes: %{name}-atlantikdesigner < %{version}-%{release} +%description extras +This package includes: +* atlantikdesigner: game board designer +* noatun-plugins + + +%prep +%setup -q -a 1 -n kdeaddons + +%patch3 -p1 -b .sdl + +%patch100 -p2 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%if 0%{?fedora} > 0 +export CXXFLAGS="${CXXFLAGS} -fpermissive" +%endif + +%configure \ + --includedir=%{_includedir}/kde \ + --disable-rpath \ + --enable-new-ldflags \ + --enable-closure \ + --disable-debug --disable-warnings \ + --disable-dependency-tracking --enable-final \ + --with-extra-includes=%{_includedir}/tqt + + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +# File lists for locale +HTML_DIR=$(kde-config --expandvars --install html) +touch %{name}.lang +if [ -d %{buildroot}/$HTML_DIR ]; then + for lang_dir in %{buildroot}/$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + fi + done +fi + +# rpmdocs +for dir in konq-plugins ; do + for file in AUTHORS ChangeLog README TODO ; do + test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" + done +done + +# install fedora metabar theme +cp -prf fedora %{buildroot}%{_datadir}/apps/metabar/themes +install -m644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/ + + +%post +/sbin/ldconfig +for f in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun +/sbin/ldconfig +for f in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%post extras +touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: + +%postun extras +touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: + + +%clean +%__rm -rf %{buildroot} + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc README +%doc rpmdocs/* +%{_bindir}/* +%{tde_libdir}/* +%{_datadir}/applications/kde/* +%{_datadir}/applnk/.hidden/* +%{_datadir}/apps/akregator/pics/* +%{_datadir}/apps/domtreeviewer/ +%{_datadir}/apps/fsview/ +%{_datadir}/apps/imagerotation/ +%{_datadir}/apps/kaddressbook/* +%{_datadir}/apps/kate/* +%{_datadir}/apps/katepart/syntax/* +%{_datadir}/apps/katexmltools +# own dir so we don't need to Requires: kdenetwork too +%dir %{_datadir}/apps/knewsticker +%{_datadir}/apps/knewsticker/* +%{_datadir}/apps/khtml/kpartplugins/* +%{_datadir}/apps/konq*view/kpartplugins/* +%{_datadir}/apps/konqueror/icons/*/*/*/* +%dir %{_datadir}/apps/konqueror/kpartplugins/ +%{_datadir}/apps/konqueror/kpartplugins/* +%{_datadir}/apps/konqueror/servicemenus/* +%{_datadir}/apps/konqsidebartng/*/* +%{_datadir}/apps/mediacontrol/ +%{_datadir}/apps/metabar/ +%{_datadir}/apps/microformat/ +#%{_datadir}/apps/noatun/* +%{_datadir}/apps/kicker/applets/* +%{_datadir}/apps/ksig/ +%{_datadir}/config*/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* +%{_datadir}/mimelnk/*/* +%{_datadir}/service*/* +%doc %lang(en) %{_docdir}/HTML/en/*/* + +# atlantikdesigner +#%exclude %{_bindir}/atlantikdesigner +#%exclude %{_datadir}/icons/hicolor/*/*/atlantikdesigner* +#%exclude %{_datadir}/applications/kde/atlantikdesigner.desktop + +# noatun-plugins +#%exclude %{_bindir}/noatun* +#%exclude %{tde_libdir}/noatun* +#%exclude %{_datadir}/apps/noatun/* + + +%files extras +%defattr(-,root,root,-) + +# atlantikdesigner +%doc atlantikdesigner/TODO +#%{_bindir}/atlantikdesigner +%{_datadir}/apps/atlantikdesigner/ +#%{_datadir}/icons/hicolor/*/*/atlantikdesigner* +#%{_datadir}/applications/kde/atlantikdesigner.desktop + +# noatun-plugins +#%{_bindir}/noatun* +#%{tde_libdir}/noatun* +%{_datadir}/apps/noatun/* + + +%changelog +* Sat Oct 29 2011 Francois Andriot - 3.5.12-3 +- Initial build for RHEL 6 + From 703986bfe4270bb901f594b92eebb265d04ad8f5 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 23:32:41 +0200 Subject: [PATCH 15/26] Lot of updates for TDE 3.5.13 (RHEL 5, RHEL 6, Fedora 15) --- redhat/components.txt | 2 + .../arts/trinity-arts-3.5.13.spec | 9 +- .../dbus-tqt/dbus-tqt-3.5.13.spec | 7 +- redhat/dependencies/libcaldav/libcaldav.spec | 14 +- .../dependencies/libcarddav/libcarddav.spec | 16 +- .../tqtinterface/tqtinterface-3.5.13.spec | 18 +- redhat/gentarball.sh | 53 +++- redhat/kdeaddons/kdeaddons-3.5.3-sdl.patch | 64 ++++ redhat/kdebase/trinity-kdebase-3.5.12.spec | 2 +- redhat/kdebase/trinity-kdebase-3.5.13.spec | 45 ++- .../trinity-kdebindings-3.5.12.spec | 5 +- .../trinity-kdebindings-3.5.13.spec | 43 ++- redhat/kdelibs/trinity-kdelibs-3.5.13.spec | 70 +++-- .../trinity-kdemultimedia-3.5.12.spec | 9 +- .../trinity-kdemultimedia-3.5.13.spec | 12 +- redhat/kdepim/trinity-kdepim-3.5.13.spec | 5 +- redhat/kdesdk/trinity-kdesdk-3.5.12.spec | 6 +- redhat/kdesdk/trinity-kdesdk-3.5.13.spec | 12 +- redhat/kdeutils/trinity-kdeutils-3.5.12.spec | 2 +- redhat/kdeutils/trinity-kdeutils-3.5.13.spec | 297 +++++++++++++++--- .../kdevelop-3.5.13-kdevdesigner-ftbfs.patch | 11 + redhat/kdevelop/trinity-kdevelop-3.5.12.spec | 3 +- redhat/kdevelop/trinity-kdevelop-3.5.13.spec | 22 +- 23 files changed, 582 insertions(+), 145 deletions(-) create mode 100644 redhat/kdeaddons/kdeaddons-3.5.3-sdl.patch create mode 100644 redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch diff --git a/redhat/components.txt b/redhat/components.txt index 2dd00f99f..19164cd87 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -1,3 +1,5 @@ +dependencies/libcaldav +dependencies/libcarddav dependencies/qt3 dependencies/tqtinterface dependencies/dbus-tqt diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec index 76df15c1c..a8e9f40c9 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec @@ -18,13 +18,16 @@ Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL Summary: aRts (analog realtime synthesizer) - the KDE sound system +Group: System Environment/Daemons Vendor: Trinity Project URL: http://www.trinitydesktop.org/ Packager: Francois Andriot -Source0: arts-%{version}.tar.gz Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: arts-%{version}.tar.gz BuildRequires: tqtinterface-devel BuildRequires: audiofile-devel @@ -54,8 +57,9 @@ playing a wave file with some effects. %package devel -Requires: %{name} +Group: Development/Libraries Summary: %{name} - Development files +Requires: %{name} = %{version}-%{release} %if "%{?_prefix}" == "/usr" Obsoletes: arts-devel %endif @@ -80,6 +84,7 @@ cd build %__make %{?_smp_mflags} %install +%__rm -rf %{?buildroot} %__make install -C build DESTDIR=%{?buildroot} %clean diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec index f1762a9d7..8e06021d6 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec @@ -20,10 +20,14 @@ Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL Summary: Dbus TQT Interface +Group: System Environment/Libraries + Vendor: Trinity Project Packager: Francois Andriot Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source0: %{name}-%{version}.tar.gz BuildRequires: gcc-c++ @@ -37,6 +41,7 @@ Dbus TQT Interface %package devel Requires: %{name} Summary: %{name} - Development files +Group: Development/Libraries %description devel Development files for %{name} @@ -58,7 +63,7 @@ cd build %install %__rm -rf %{?buildroot} %__mkdir_p %{?buildroot}%{_includedir} -%make_install -C build +%__make install DESTDIR=%{?buildroot} -C build %clean %__rm -rf %{?buildroot} diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index 220913b3b..86b0f4c8b 100644 --- a/redhat/dependencies/libcaldav/libcaldav.spec +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -10,8 +10,16 @@ License: GPL Group: System Environment/Libraries Summary: A client library that adds support for the CalDAV protocol (rfc4791). +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source0: libcaldav_0.6.5-2debian2.tar.gz +%if 0%{?fedora} || 0%{?rhel} >= 6 +BuildRequires: libcurl-devel +%else +BuildRequires: trinity-libcurl-devel +%endif + %description libcaldev is a client library that adds support for the CalDAV protocol (rfc4791). The object is to have a library which fully implements the protocol so that it is @@ -38,6 +46,10 @@ autoreconf --force --install --symlink %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# The include files do not go in the correct directory +%__mv -f %{buildroot}%{_includedir}/%{name}-0.6.2/*.h %{buildroot}%{_includedir} +%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.2 + %clean %__rm -rf %{buildroot} @@ -47,7 +59,7 @@ autoreconf --force --install --symlink %{_datadir}/doc/%{name} %files devel -%{_includedir}/%{name}-0.6.2 +%{_includedir}/*.h %{_libdir}/*.a %{_libdir}/*.la %{_libdir}/*.so diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index cc01ccc69..ed1ce2a70 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -8,10 +8,18 @@ Packager: Francois Andriot License: GPL Group: System Environment/Libraries -Summary: Libcarddav is a portable CardDAV client implementation. +Summary: A portable CardDAV client implementation originally developed for the Trinity PIM suite. + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: libcarddav_0.6.2-2debian2.tar.gz +%if 0%{?fedora} || 0%{?rhel} >= 6 +BuildRequires: libcurl-devel +%else +BuildRequires: trinity-libcurl-devel +%endif + %description Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. @@ -38,6 +46,10 @@ autoreconf --force --install --symlink %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# The include files do not go in the correct directory +%__mv -f %{buildroot}%{_includedir}/%{name}-0.6.1/*.h %{buildroot}%{_includedir} +%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.1 + %clean %__rm -rf %{buildroot} @@ -46,7 +58,7 @@ autoreconf --force --install --symlink %{_libdir}/*.so.* %files devel -%{_includedir}/%{name}-0.6.1 +%{_includedir}/*.h %{_libdir}/*.a %{_libdir}/*.la %{_libdir}/*.so diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec index 859afa0bd..d1a56fa18 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec @@ -27,12 +27,14 @@ Version: %{version} Release: %{release}%{?dist}%{?_variant} License: GPL Summary: Trinity QT Interface +Group: System Environment/Libraries Vendor: Trinity Project URL: http://www.trinitydesktop.org/ Packager: Francois Andriot Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}.tar.gz @@ -45,8 +47,9 @@ BuildRequires: pth-devel Trinity QT Interface %package devel -Requires: %{name} +Group: Development/Libraries Summary: %{name} - Development files +Requires: %{name} = %{version}-%{release} %description devel Development files for %{name} @@ -75,11 +78,18 @@ cd build %install %__rm -rf %{?buildroot} %__mkdir_p %{?buildroot}%{_includedir} -%make_install -C build +%__make install DESTDIR=%{?buildroot} -C build + +# RHEL 5: add newline at end of include files +%if 0%{?rhel} && 0%{?rhel} <= 5 +for i in %{?buildroot}%{_includedir}/*.h; do + echo "" >>${i} +done +%endif # Fix 'tqt.pc': UIC executable is not correct -sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \ - -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,' +#sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \ +# -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,' # Install 'cmake' modules for a specific package (for later use) %__mkdir_p %{?buildroot}%{cmake_modules_dir} diff --git a/redhat/gentarball.sh b/redhat/gentarball.sh index ab337ac6a..9715cffd0 100755 --- a/redhat/gentarball.sh +++ b/redhat/gentarball.sh @@ -27,33 +27,62 @@ select COMP in $( cut -f1 components.txt ) ; do echo echo "You currently have the following tarball(s): " for i in ${ARCHIVEDIR}/${COMP##*/}*.tar.gz; do echo " ${i##*/}"; done + echo fi # Checks latest SVN revision - SVNREV=$( LANG=C svn info svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface|sed -n "/^Revision: / s,.* \(.*\),\1,p" ) - ARCHIVENAME=${COMP##*/}-${VERSION}.${SVNREV}.tar.gz + unset ARCHIVENAME + case "${COMP##*/}" in + "libcaldav"|"libcarddav"|"qt3") ;; + *) + SVNREV=$( LANG=C svn info svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface|sed -n "/^Revision: / s,.* \(.*\),\1,p" ) + ARCHIVENAME=${COMP##*/}-${VERSION}.${SVNREV}.tar.gz - if [ -r ${ARCHIVEDIR}/${ARCHIVENAME} ]; then - echo "You already have the latest revision (${SVNREV})"; - fi + if [ -r ${ARCHIVEDIR}/${ARCHIVENAME} ]; then + echo "You already have the latest revision (${SVNREV})"; + else + echo "A new revision is available: ${SVNREV}" + fi + ;; + esac echo - echo "Press ENTER to download a new version, or CTRL+C to abort." + echo "Press ENTER to download the new tarball, or CTRL+C to abort." read rep TMPDIRTDE=$(mktemp -d) pushd "${TMPDIRTDE}" >/dev/null mkdir -p "${TMPDIRTDE}/${COMP}" pushd "${COMP}/.." >/dev/null - echo "Extracting '${COMP}' from SVN ..." case "${COMP##*/}" in - "qt3") git clone http://scm.trinitydesktop.org/scm/git/tde; mv tde/main/dependencies/qt3 . ;; - *) svn export --force --quiet svn://anonsvn.kde.org/home/kde/branches/trinity/${COMP} ;; + "libcaldav") + echo "Downloading '${COMP}' ..." + ARCHIVENAME="libcaldav_0.6.5-2debian2.tar.gz" + wget --no-check-certificate "https://quickbuild.pearsoncomputing.net/~trinity/+archive/trinity-builddeps/+files/libcaldav_0.6.5-2debian2.tar.gz" + ;; + "libcarddav") + echo "Downloading '${COMP}' ..." + ARCHIVENAME="libcarddav_0.6.2-2debian2.tar.gz" + wget --no-check-certificate "https://quickbuild.pearsoncomputing.net/~trinity/+archive/trinity-builddeps/+files/libcarddav_0.6.2-2debian2.tar.gz" + ;; + "qt3") + echo "Extracting '${COMP}' from GIT ..." + git clone http://scm.trinitydesktop.org/scm/git/tde; mv tde/main/dependencies/qt3 . + ;; + *) + echo "Extracting '${COMP}' from SVN ..." + svn export --force --quiet svn://anonsvn.kde.org/home/kde/branches/trinity/${COMP} + ;; esac - popd >/dev/null - echo "Creating archive '${ARCHIVENAME}' ..." - tar cfz ${ARCHIVEDIR}/${ARCHIVENAME} ${COMP} + if [ ! -r "${ARCHIVENAME}" ]; then + popd >/dev/null + echo "Creating archive '${ARCHIVENAME}' ..." + tar cfz ${ARCHIVEDIR}/${ARCHIVENAME} ${COMP} + else + mv *.tar.gz ${ARCHIVEDIR}/ + popd >/dev/null + fi popd >/dev/null echo "Cleaning temporary directory ..." rm -rf "${TMPDIRTDE}" diff --git a/redhat/kdeaddons/kdeaddons-3.5.3-sdl.patch b/redhat/kdeaddons/kdeaddons-3.5.3-sdl.patch new file mode 100644 index 000000000..70e72dc96 --- /dev/null +++ b/redhat/kdeaddons/kdeaddons-3.5.3-sdl.patch @@ -0,0 +1,64 @@ +--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp.than 2006-06-07 18:52:09.000000000 +0200 ++++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/sdlwrap.cpp 2006-06-07 18:54:06.000000000 +0200 +@@ -183,6 +183,7 @@ + SDL_UpdateRect(surface, 0, 0, 0, 0); + } + ++#if 0 + int SdlScreen::winID(void) + { + SDL_SysWMinfo info; +@@ -195,3 +196,4 @@ + SDL_GetWMInfo(&info); + return info.info.x11.wmwindow; + } ++#endif +--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp.than 2006-06-07 18:54:19.000000000 +0200 ++++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/main.cpp 2006-06-07 18:54:27.000000000 +0200 +@@ -112,7 +112,7 @@ + { + time_t timer = time(NULL); + +- printf("%u\n", static_cast(screen)->winID()); ++ //printf("%u\n", static_cast(screen)->winID()); + fflush(stdout); + + int frames = 0; +--- kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h.than 2006-06-07 18:51:25.000000000 +0200 ++++ kdeaddons-3.5.3/noatun-plugins/tippercanoe/syna.h 2006-06-07 18:51:56.000000000 +0200 +@@ -108,7 +108,7 @@ + int sizeUpdate(); + bool inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &keyHit); + void show(); +- int winID(); ++ //int winID(); + }; + + // core +--- kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp.than 2006-06-07 18:54:38.000000000 +0200 ++++ kdeaddons-3.5.3/noatun-plugins/tyler/main.cpp 2006-06-07 18:55:00.000000000 +0200 +@@ -52,6 +52,7 @@ + SDL_Surface *screen; + } + ++#if 0 + int winID(void) + { + SDL_SysWMinfo info; +@@ -61,6 +62,7 @@ + SDL_GetWMInfo(&info); + return info.info.x11.wmwindow; + } ++#endif + + int main(int, char **) + { +@@ -74,7 +76,7 @@ + access_mutex = SDL_CreateMutex(); + + init_renderer1(); +- printf("%u\n", winID()); ++ //printf("%u\n", winID()); + fflush(stdout); + init_renderer2(); + thread = SDL_CreateThread((int (*)(void *))renderer, NULL); diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec index f060b3c44..3229fe15d 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.12.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec @@ -152,7 +152,7 @@ Requires: %{name} = %{version}-%{release} %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries -Requires: trinity-kdelibs >= %{version} +Requires: trinity-kdelibs %if "%{?_prefix}" == "/usr" Obsoletes: kdebase%{?_qt_suffix}-libs %endif diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index a35207c56..70285a44c 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -15,24 +15,34 @@ BuildRequires: cmake >= 2.8 %define tde_docdir %{_docdir}/kde %define tde_libdir %{_libdir}/trinity +# Older RHEL/Fedora versions use packages named "qt", "qt-devel", .. +# whereas newer versions use "qt3", "qt3-devel" ... +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 +%define _qt_suffix 3 +%endif + Name: trinity-kdebase Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL Summary: Trinity KDE Base Programs +Group: User Interface/Desktops Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kdebase-%{version}.tar.gz # Wrapper script to prevent Plasma launch at Trinity Startup Source1: plasma-desktop +Patch100: svn.patch + # TDE for RHEL/Fedora specific patches # [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch @@ -44,7 +54,7 @@ Patch6: kdebase-3.5.12-halmountoptions.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel BuildRequires: trinity-kdelibs-devel -BuildRequires: qt3-devel >= 3.3.8d +BuildRequires: qt%{?_qt_suffix}-devel BuildRequires: openssl-devel BuildRequires: avahi-devel avahi-qt3-devel BuildRequires: imake @@ -55,7 +65,7 @@ BuildRequires: dbus-devel dbus-qt-devel BuildRequires: lm_sensors-devel BuildRequires: libfontenc-devel BuildRequires: hal-devel -BuildRequires: audiofile-devel +BuildRequires: audiofile-devel alsa-lib-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: libraw1394-devel BuildRequires: openldap-devel @@ -63,13 +73,17 @@ BuildRequires: libvorbis-devel BuildRequires: pam-devel BuildRequires: libXdmcp-devel BuildRequires: libxkbfile-devel +BuildRequires: libusb-devel +BuildRequires: esound-devel glib2-devel nas-devel +BuildRequires: libXcomposite-devel BuildRequires: dbus-tqt-devel BuildRequires: libXtst-devel +BuildRequires: libXdamage-devel Requires: tqtinterface Requires: trinity-arts Requires: trinity-kdelibs -Requires: qt3 >= 3.3.8d +Requires: qt%{?_qt_suffix} Requires: openssl Requires: avahi avahi-qt3 Requires: dbus-tqt @@ -98,7 +112,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: trinity-kdelibs-devel Summary: %{summary} - Development files %if "%{?_prefix}" == "/usr" -Obsoletes: kdebase3-devel +Obsoletes: kdebase%{?_qt_suffix}-devel %endif Group: Development/Libraries %description devel @@ -124,7 +138,7 @@ Summary: %{name} runtime libraries Group: System Environment/Libraries Requires: trinity-kdelibs %if "%{?_prefix}" == "/usr" -Obsoletes: kdebase3-libs +Obsoletes: kdebase%{?_qt_suffix}-libs %endif Requires: %{name} = %{version}-%{release} %description libs @@ -148,6 +162,8 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch5 -p1 %patch6 -p1 +%patch100 -p1 + %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -166,7 +182,11 @@ cd build -DWITH_XCOMPOSITE=ON \ -DWITH_XCURSOR=ON \ -DWITH_XFIXES=ON \ +%if 0%{?fedora} || 0%{?rhel} > 5 -DWITH_XRANDR=ON \ +%else + -DWITH_XRANDR=OFF \ +%endif -DWITH_XRENDER=ON \ -DWITH_XDAMAGE=ON \ -DWITH_XEXT=ON \ @@ -186,8 +206,7 @@ cd build %install %__rm -rf %{?buildroot} -%__mkdir_p %{?buildroot} -%make_install -C build +%__make install DESTDIR=%{?buildroot} -C build # Adds a GDM/KDM/XDM session called 'TDE' %if "%{?_prefix}" != "/usr" @@ -327,7 +346,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_bindir}/konqueror %{_bindir}/konsole %{_bindir}/krandom.kss -%{_bindir}/krandrtray %{_bindir}/krdb %{_bindir}/kreadconfig %{_bindir}/ksmserver @@ -375,6 +393,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_bindir}/khc_mansearch.pl %{_bindir}/kicker %{_bindir}/knetattach +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 +%{_bindir}/krandrtray +%endif %{_bindir}/kompmgr %{_bindir}/kpm %{_bindir}/ksplash @@ -404,12 +425,17 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{tde_libdir}/* %{_libdir}/libkdeinit_*.* %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu +%if 0%{?fedora} >= 15 && "%{?_prefix}" != "/usr" +%exclude %{_sysconfdir}/xdg/menus/kde-information.menu +%else %{_sysconfdir}/xdg/menus/kde-information.menu +%endif %{_sysconfdir}/xdg/menus/kde-screensavers.menu %{_sysconfdir}/xdg/menus/kde-settings.menu /usr/share/xsessions/*.desktop # Remove conflicts with redhat-menus %if "%{?_prefix}" != "/usr" +%{_bindir}/plasma-desktop %config(noreplace) %{_datadir}/config/* %else %exclude %{_datadir}/config @@ -424,9 +450,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/services/pop3*.protocol %exclude %{_datadir}/services/smtp*.protocol -# New in TDE 3.5.12 -%{_bindir}/plasma-desktop - # New in TDE 3.5.13 %{_bindir}/krootbacking %{_bindir}/tsak diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec index 3e654a49f..2c4af58b7 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec @@ -27,7 +27,7 @@ Group: User Interface/Desktops Vendor: Trinity Project Packager: Francois Andriot -URL: http://developer.kde.org/language-bindings/ +URL: http://www.trinitydesktop.org/ Source0: kdebindings-%{version}.tar.gz @@ -211,6 +211,7 @@ done %clean %__rm -rf $RPM_BUILD_ROOT + %post /sbin/ldconfig ||: touch --no-create %{_datadir}/icons/hicolor ||: @@ -265,7 +266,7 @@ update-desktop-database >& /dev/null ||: %files devel %defattr(-,root,root,-) -%{_includedir}/kde/* +%{tde_includedir}/* %{_libdir}/lib*.so %if "%{?_with_java:1}" == "1" %{_libdir}/jni/*.so diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec index f0b76045b..d395d44fb 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec @@ -13,8 +13,8 @@ # TDE 3.5.13 specific building variables BuildRequires: autoconf automake libtool m4 %define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity +%define tde_includedir %{_includedir}/kde Name: trinity-kdebindings @@ -31,6 +31,10 @@ URL: http://www.trinitydesktop.org/ Source0: kdebindings-%{version}.tar.gz +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + # RedHat Legacy patches (from Fedora) Patch1: kdebindings-3.5.6-libgcj.patch @@ -40,6 +44,8 @@ BuildRequires: trinity-kdelibs-devel BuildRequires: zlib-devel BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: trinity-arts-devel +BuildRequires: glib-devel gtk+-devel +BuildRequires: gtk2-devel %define perl_ver %{expand:%%(eval `perl -V:version`; echo $version)} %define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)} %define perl_vendorlib %{expand:%%(eval `perl -V:installvendorlib`; echo $installvendorlib)} @@ -60,12 +66,16 @@ Provides: %{name}-dcoppython = %{version}-%{release} ## ruby BuildRequires: ruby-devel >= 1.8, ruby Provides: %{name}-ruby = %{version}-%{release} +%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')} %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')} %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')} ## java -#BuildRequires: java-1.4.2-gcj-compat-devel libgcj-devel gcc-java +%if 0%{?rhel} && 0%{?rhel} < 6 +BuildRequires: java-1.4.2-gcj-compat-devel libgcj-devel gcc-java +%else BuildRequires: java-devel >= 1.4.2 +%endif %define java_home %{_usr}/lib/jvm/java %define _with_java --with-java=%{java_home} Provides: %{name}-java = %{version}-%{release} @@ -122,6 +132,7 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE python" --disable-dependency-tracking \ --with-extra-libs=%{_libdir} \ --with-pythondir=%{_usr} \ + --enable-closure \ --disable-final \ %{?_with_java} %{!?_with_java:--without-java} \ %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} \ @@ -149,7 +160,7 @@ popd export PATH="%{_bindir}:${PATH}" %__rm -rf $RPM_BUILD_ROOT -%make_install \ +%__make install DESTDIR=%{?buildroot} \ PYTHON=%{__python} desktop-file-install \ @@ -176,14 +187,6 @@ fi # locale's %find_lang %{name} || touch %{name}.lang HTML_DIR=$(kde-config --expandvars --install html) - -# Fix HTML doc location in TDE 3.5.13 -# (from 'share/doc/HTML' to 'share/doc/kde/HTML') -if [ ! -d $RPM_BUILD_ROOT$HTML_DIR ] && [ -d $RPM_BUILD_ROOT%{_docdir}/HTML ]; then - mkdir -p $RPM_BUILD_ROOT${HTML_DIR%/*} - mv -f $RPM_BUILD_ROOT%{_docdir}/HTML $RPM_BUILD_ROOT${HTML_DIR%/*} -fi - if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do if [ -d $lang_dir ]; then @@ -248,17 +251,14 @@ update-desktop-database >& /dev/null ||: #%{ruby_sitelib}/K* #%{ruby_sitelib}/Qt* %{_usr}/lib/ruby/*/* -%if 0%{?fedora} >= 15 -%{_usr}/lib64/ruby/*/*/*.so.* -%else -%{_usr}/lib64/ruby/*/*.so.* -%endif +%{ruby_arch}/*.so.* +%doc %lang(en) %{_docdir}/HTML/en/javalib/* # Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6) %if "%{?_prefix}" == "/usr" %exclude %{_bindir}/kjscmd -%endif %exclude %{_mandir}/man1/kjscmd* +%endif %files dcopperl -f %{name}-dcopperl.list @@ -274,13 +274,8 @@ update-desktop-database >& /dev/null ||: %{_libdir}/jni/*.so %{_libdir}/jni/*.la %endif -%if 0%{?fedora} >= 15 -%{_usr}/lib64/ruby/*/*/*.so -%{_usr}/lib64/ruby/*/*/*.la -%else -%{_usr}/lib64/ruby/*/*.so -%{_usr}/lib64/ruby/*/*.la -%endif +%{ruby_arch}/*.so +%{ruby_arch}/*.la %changelog * Sat Sep 03 2011 Francois Andriot = 2.8 %define tde_docdir %{_docdir}/kde %define tde_libdir %{_libdir}/trinity +# Older RHEL/Fedora versions use packages named "qt", "qt-devel", .. +# whereas newer versions use "qt3", "qt3-devel" ... +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 +%define _qt_suffix 3 +%endif + Name: trinity-kdelibs Version: %{version} Release: %{?release}%{?dist}%{?_variant} License: GPL -Summary: Trinity KDE Libraries +Summary: TDE Libraries +Group: System Environment/Libraries Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ -Source0: kdelibs-%{version}.tar.gz Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: kdelibs-%{version}.tar.gz BuildRequires: libtool BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel -BuildRequires: qt3-devel -BuildRequires: avahi-devel avahi-qt3-devel -#BuildRequires: lua-devel +BuildRequires: avahi-devel +BuildRequires: lua-devel BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel BuildRequires: libutempter-devel BuildRequires: bzip2-devel BuildRequires: openssl-devel -BuildRequires: libtiff-devel +BuildRequires: gcc-c++ +BuildRequires: alsa-lib-devel +BuildRequires: libidn-devel +BuildRequires: qt%{?_qt_suffix}-devel +BuildRequires: avahi-qt3-devel BuildRequires: jasper-devel -Requires: tqtinterface -Requires: trinity-arts -Requires: qt3 -Requires: avahi avahi-qt3 +Requires: tqtinterface +Requires: trinity-arts +Requires: avahi +Requires: qt%{?_qt_suffix} +Requires: avahi-qt3 %if "%{?_prefix}" == "/usr" -Obsoletes: kdelibs3 +Obsoletes: kdelibs%{?_qt_suffix} %endif %description -Libraries for the Trinity K Desktop Environment +Libraries for the Trinity Desktop Environment: +KDE Libraries included: kdecore (KDE core library), kdeui (user interface), +kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking), +kspell (spelling checker), jscript (javascript), kab (addressbook), +kimgio (image manipulation). + %package devel -Requires: %{name} Summary: %{name} - Development files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} %if "%{?_prefix}" == "/usr" -Obsoletes: kdelibs3-devel +Obsoletes: kdelibs%{?_qt_suffix}-devel %endif %description devel -Development files for %{name} +This package includes the header files you will need to compile +applications for TDE. %package apidocs -Requires: %{name} +Group: Development/Libraries Summary: %{name} - API documentation +Requires: %{name} = %{version}-%{release} +%if "%{?_prefix}" == "/usr" +Obsoletes: kdelibs%{?_qt_suffix}-apidocs-devel +%endif %description apidocs -This package includes the KDE 3 API documentation in HTML +This package includes the TDE API documentation in HTML format for easy browsing + %prep %setup -q -n kdelibs -# Gets the cmake modules in current build directory -%__mkdir_p cmake/modules -%__cp -f %{_datadir}/cmake/*.* cmake/modules - - %build unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" @@ -111,17 +131,17 @@ cd build %install %__rm -rf %{?buildroot} -%__mkdir_p %{?buildroot} -%make_install -C build +%__make install DESTDIR=%{?buildroot} -C build %__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d cat <%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf %if "%{?_prefix}" != "/usr" %{_libdir} %endif -%{_libdir}/trinity +%{tde_libdir} EOF + %clean %__rm -rf %{?buildroot} diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec index e4f1f310c..82e4df87f 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec @@ -43,6 +43,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kdemultimedia-%{version}.tar.gz +Provides: kdemultimedia3 = %{version}-%{release} + # RedHat Legacy patches (from Fedora 8) Patch3: kdemultimedia-3.4.0-xdg.patch Patch5: kdemultimedia-3.5.7-pthread.patch @@ -159,7 +161,8 @@ export CXXFLAGS="${CXXFLAGS} -lDCOP" %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \ %{?_with_taglib} %{!?_with_taglib:--without-taglib} \ %{?_with_xine} %{!?_with_xine:--without-xine} \ - --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt + --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt \ + --enable-closure %__make %{?_smp_mflags} @@ -172,7 +175,7 @@ export PATH="%{_bindir}:${PATH}" %__make install DESTDIR=%{?buildroot} -C kaudiocreator ## Remove/uninstall (conflicting) bits we don't want -rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass +%__rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass # only show in KDE, really? -- Rex (FIXME) for f in %{buildroot}%{appdir}/*.desktop ; do @@ -217,6 +220,7 @@ done %post +/sbin/ldconfig for f in crystalsvg hicolor locolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: @@ -224,6 +228,7 @@ done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun +/sbin/ldconfig for f in crystalsvg hicolor locolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index 868754041..0eda9a831 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -38,8 +38,10 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source0: kdemultimedia-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: kdemultimedia3 = %{version}-%{release} @@ -47,8 +49,8 @@ Provides: kdemultimedia3 = %{version}-%{release} Patch3: kdemultimedia-3.4.0-xdg.patch Patch5: kdemultimedia-3.5.7-pthread.patch -Patch100: svn.patch +Provides: kdemultimedia3 = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} @@ -67,6 +69,8 @@ BuildRequires: automake libtool %{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel} %{?_with_taglib:BuildRequires: taglib-devel} %{?_with_xine:BuildRequires: xine-lib-devel} +BuildRequires: libXxf86dga-devel +BuildRequires: libXxf86vm-devel %description The K Desktop Environment (KDE) is a GUI desktop for the X Window @@ -125,8 +129,6 @@ Requires: %{name} = %{version}-%{release} %patch3 -p1 -b .xdg %patch5 -p1 -b .pthread -%patch100 -p1 - # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! sed -i admin/acinclude.m4.in \ @@ -169,7 +171,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %install export PATH="%{_bindir}:${PATH}" -%__rm -rf %{buildroot} +%__rm -rf %{?buildroot} %__make install DESTDIR=%{buildroot} ## Remove/uninstall (conflicting) bits we don't want diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec index c8b4a8c5f..670eb0e92 100644 --- a/redhat/kdepim/trinity-kdepim-3.5.13.spec +++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec @@ -29,6 +29,7 @@ Summary: PIM (Personal Information Manager) applications Prefix: %{_prefix} Source0: kdepim-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tqtinterface BuildRequires: trinity-arts @@ -58,6 +59,7 @@ PIM (Personal Information Manager) applications. %package devel Requires: %{name} Summary: %{name} - Development files +Group: Development/Libraries %description devel Development files for %{name}. @@ -101,7 +103,7 @@ cd build %install export PATH="%{_bindir}:${PATH}" %__rm -rf %{?buildroot} -%make_install -C build +%__make install DESTDIR=%{?buildroot} -C build %clean %__rm -rf %{?buildroot} @@ -122,6 +124,7 @@ export PATH="%{_bindir}:${PATH}" %{_datadir}/config.kcfg/* %{_libdir}/lib*.so.* %{tde_libdir}/*.so +#%{tde_libdir}/*.so.* %{tde_libdir}/plugins/designer/*.so %{_datadir}/servicetypes/* %{_libdir}/kconf_update_bin/* diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec index 238fe5656..7458317d2 100644 --- a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec +++ b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec @@ -50,7 +50,7 @@ Provides: kdesdk3 = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} -BuildRequires: automake libtool +BuildRequires: libtool BuildRequires: tqtinterface-devel BuildRequires: pcre-devel BuildRequires: trinity-kdelibs-devel @@ -66,7 +66,7 @@ BuildRequires: libxslt-devel libxml2-devel BuildRequires: binutils-devel %endif BuildRequires: perl -%{?_with_subversion:BuildRequires: subversion-devel neon-devel} +BuildRequires: subversion-devel neon-devel # Obsoletes/Provides %define cervisia_ver 2.4.7 @@ -99,7 +99,7 @@ Requires: trinity-kdelibs-devel %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries -Requires: trinity-kdelibs >= %{version} +Requires: trinity-kdelibs # helps multilib upgrades Obsoletes: %{name} < %{version}-%{release} # include to be paranoid, installing libs-only is still mostly untested -- Rex diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec index 19dae5b0b..2563ec93a 100644 --- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec +++ b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec @@ -26,7 +26,10 @@ Group: User Interface/Desktops URL: http://www.trinitydesktop.org/ Vendor: Trinity Project Packager: Francois Andriot -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source: kdesdk-%{version}.tar.gz # RedHat Legacy patches @@ -48,7 +51,9 @@ BuildRequires: desktop-file-utils BuildRequires: flex # umbrello BuildRequires: libxslt-devel libxml2-devel +%if 0%{?fedora} > 5 || 0%{?rhel} > 4 BuildRequires: binutils-devel +%endif BuildRequires: perl BuildRequires: subversion-devel neon-devel @@ -111,14 +116,15 @@ cd build -DBUILD_ALL=ON \ .. -%__make %{?_smp_mflags} +# Do not use %{?_smp_mflags} ! +%__make %install export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} -%make_install -C build +%__make install DESTDIR=%{?buildroot} -C build desktop-file-install --vendor "" \ --dir %{buildroot}%{_datadir}/applications/kde \ diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.12.spec b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec index 5e65d0712..5cf187ce2 100755 --- a/redhat/kdeutils/trinity-kdeutils-3.5.12.spec +++ b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec @@ -79,6 +79,7 @@ Utilities for the Trinity Desktop Environment, including: * ktimer (task scheduler) * kwikdisk (removable media utility) + # afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex %package devel Summary: Development files for %{name} @@ -222,7 +223,6 @@ done %files extras %defattr(-,root,root,-) - # kmilo %{tde_libdir}/kded_kmilod.* %{tde_libdir}/kmilo* diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec index 643344108..f58564dda 100755 --- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec +++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec @@ -12,7 +12,8 @@ # TDE 3.5.13 specific building variables BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir} +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity @@ -20,34 +21,95 @@ Name: trinity-kdeutils Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL +Summary: TDE Utilities +Group: Applications/System + Vendor: Trinity Project Packager: Francois Andriot -Summary: Trinity KDE Utilities +URL: http://www.trinitydesktop.org/ + Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kdeutils-%{version}.tar.gz +Source1: klaptop_acpi_helper.pam +Source2: klaptop_acpi_helper.console +Source3: kcmlaptoprc BuildRequires: tqtinterface BuildRequires: trinity-arts BuildRequires: trinity-kdelibs +# RedHat / Fedora legacy patches +Patch1: kdf-3.0.2-label.patch + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + Requires: tqtinterface Requires: trinity-kdelibs +BuildRequires: gettext +BuildRequires: net-snmp-devel +BuildRequires: python-devel +BuildRequires: gmp-devel +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 +BuildRequires: libXScrnSaver-devel libXtst-devel +%endif +BuildRequires: xmms-devel + +%define superkaramba_ver 0.39 +Obsoletes: superkaramba < 0:%{superkaramba_ver} +Provides: superkaramba = 0:%{superkaramba_ver} + %description -Trinity KDE Utilities. +Utilities for the Trinity Desktop Environment, including: + * ark (tar/gzip archive manager) + * kcalc (scientific calculator) + * kcharselect (character selector) + * kdepasswd (change password) + * kdessh (ssh front end) + * kdf (view disk usage) + * kedit (simple text editor) + * kfloppy (floppy formatting tool) + * kgpg (gpg gui) + * khexedit (hex editor) + * kjots (note taker) + * kregexpeditor (regular expression editor) + * ktimer (task scheduler) + * kwikdisk (removable media utility) +# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex %package devel -Requires: %{name} -Summary: %{name} - Development files +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: %{name}-extras = %{version}-%{release} +Requires: trinity-kdelibs-devel %description devel Development files for %{name}. +%package extras +Summary: Extras packages from %{name} +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%if 0%{?fedora} > 5 || 0%{?rhel} > 4 +Requires: pm-utils +%endif +Requires: usermode +%description extras +More Utilities for the K Desktop Environment: + * kmilo + * ksim (system information monitor); + * klaptopdaemon (battery monitoring and management for laptops); + %prep %setup -q -n kdeutils +%patch1 -p1 -b .label + # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! sed -i admin/acinclude.m4.in \ @@ -61,55 +123,220 @@ sed -i admin/acinclude.m4.in \ unset QTDIR || : ; source /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" -export LDFLAGS="${LDFLAGS} -lqt-mt -lkdeui -L${QTLIB}" %configure \ - --disable-rpath \ - --enable-new-ldflags \ - --disable-dependency-tracking \ - --disable-debug --disable-warnings --enable-final \ - --with-xinerama \ - --with-extra-includes=%{_includedir}/tqt \ - --with-extra-libs=%{tde_libdir} \ - --enable-closure + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-rpath \ + --disable-debug --disable-warnings \ + --enable-final \ + --includedir=%{tde_includedir} \ + --with-snmp \ + --with-xscreensaver \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure %__make %{?_smp_mflags} %install -%__rm -rf %{?buildroot} -%__mkdir_p %{?buildroot} export PATH="%{_bindir}:${PATH}" -%make_install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} + +# Show only in KDE (really? -- Rex) +for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \ + KCharSelect ark kwalletmanager kwalletconfig \ + irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do + if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then + echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop + fi +done + +## File lists +# locale's +%find_lang %{name} || touch %{name}.lang +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + pushd $lang_dir/kcontrol + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common + done + popd + fi +done +fi + +# using pam +install -p -D -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/klaptop_acpi_helper +install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper + +pushd %{buildroot}%{_bindir} + mkdir -p %{buildroot}%{_sbindir} + mv klaptop_acpi_helper ../sbin + ln -s consolehelper klaptop_acpi_helper +popd + +# klaptop setting +install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc + %clean %__rm -rf %{?buildroot} -%files + +%post +/sbin/ldconfig +for f in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun +/sbin/ldconfig +for f in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%post extras +/sbin/ldconfig +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done + +%postun extras +/sbin/ldconfig +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done + + +%files extras +%defattr(-,root,root,-) +# kmilo +%{tde_libdir}/kded_kmilod.* +%{tde_libdir}/kmilo* +%{_libdir}/libkmilo.la +%{_libdir}/libkmilo.so.* +%{_datadir}/services/kded/kmilod.desktop +%{_datadir}/services/kmilo +%{_datadir}/servicetypes/kmilo + +# ksim +%doc %{_docdir}/HTML/*/ksim/ +%{tde_libdir}/ksim* +%{_libdir}/libksimcore.la +%{_libdir}/libksimcore.so.* +%{_datadir}/apps/kicker/extensions/ksim.desktop +%{_datadir}/apps/ksim/ +%config %{_datadir}/config/ksim_panelextensionrc +%{_datadir}/icons/crystalsvg/??x??/apps/ksim.png +%{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png + +# klaptop +%doc %{_docdir}/HTML/en/kcontrol +%{_sysconfdir}/pam.d/klaptop_acpi_helper +%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper +%{_bindir}/klaptop* +%{tde_libdir}/kded_klaptopdaemon.* +%{_sbindir}/klaptop_acpi_helper +%{_datadir}/apps/klaptopdaemon +%{_datadir}/services/kded/klaptopdaemon.desktop +%{tde_libdir}/kcm_laptop.* +%{_libdir}/libkcmlaptop.* +%{_datadir}/applications/kde/laptop.desktop +%config %{_datadir}/config/kcmlaptoprc +%{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png +%{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png +%{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz + + +%files -f %{name}.lang %defattr(-,root,root,-) + +# kmilo +%exclude %{tde_libdir}/kded_kmilod.* +%exclude %{tde_libdir}/kmilo* +%exclude %{_libdir}/libkmilo.la +%exclude %{_libdir}/libkmilo.so.* +%exclude %{_datadir}/services/kded/kmilod.desktop +%exclude %{_datadir}/services/kmilo +%exclude %{_datadir}/servicetypes/kmilo + +# ksim +%exclude %{_docdir}/HTML/*/ksim/ +%exclude %{tde_libdir}/ksim* +%exclude %{_libdir}/libksimcore.la +%exclude %{_libdir}/libksimcore.so.* +%exclude %{_datadir}/apps/kicker/extensions/ksim.desktop +%exclude %{_datadir}/apps/ksim/ +%exclude %{_datadir}/config/ksim_panelextensionrc +%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ksim.png +%exclude %{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png + +# klaptop +%exclude %{_sysconfdir}/pam.d/klaptop_acpi_helper +%exclude %{_sysconfdir}/security/console.apps/klaptop_acpi_helper +%exclude %{_bindir}/klaptop* +%exclude %{tde_libdir}/kded_klaptopdaemon.* +%exclude %{_sbindir}/klaptop_acpi_helper +%exclude %{_datadir}/apps/klaptopdaemon +%exclude %{_datadir}/services/kded/klaptopdaemon.desktop +%exclude %{tde_libdir}/kcm_laptop.* +%exclude %{_libdir}/libkcmlaptop.* +%exclude %{_datadir}/applications/kde/laptop.desktop +%exclude %{_datadir}/config/kcmlaptoprc +%exclude %{_docdir}/HTML/en/kcontrol/ +%exclude %{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png +%exclude %{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png +%exclude %{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz + +%attr(644,root,root) %{_sysconfdir}/security/console.apps/* +%attr(644,root,root) %{_sysconfdir}/pam.d/* %{_bindir}/* -%{_datadir}/applications/kde/*.desktop +%{_sbindir}/* +%{tde_libdir}/* +%{_libdir}/*.la +%{_libdir}/libkdeinit*.so +%{_libdir}/lib*.so.* +%{_datadir}/icons/*/*/*/* %{_datadir}/apps/* -%{_datadir}/autostart/*.desktop -%{_datadir}/config/* -%{_datadir}/icons/* -%{_datadir}/services/* +%config %{_datadir}/config/* %{_datadir}/config.kcfg/* -%{_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop -%{_libdir}/lib*.so.* -%{_libdir}/libkdeinit*.so -%{tde_libdir}/*.so -%{tde_docdir}/HTML/en/* - -%{_datadir}/applnk/*/* +%{_datadir}/services/* +%{_datadir}/servicetypes/* +%{_datadir}/applications/kde/* +%if 0%{?rhel} >= 5 || 0%{?fedora} +%{_datadir}/applnk/Utilities/* %{_datadir}/mimelnk/application/* - +%endif +%{_datadir}/autostart/* +%doc %lang(en) %{_docdir}/HTML/en/* %files devel %defattr(-,root,root,-) -%{_libdir}/*.la -%{_libdir}/*.so -%{_includedir}/* -%{tde_libdir}/*.la +%{tde_includedir}/* +%{_libdir}/libkcmlaptop.so +%{_libdir}/libkhexeditcommon.so +%{_libdir}/libkmilo.so +%{_libdir}/libkregexpeditorcommon.so +%{_libdir}/libksimcore.so + %changelog * Mon Sep 05 2011 Francois Andriot - 3.5.13-0 diff --git a/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch b/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch new file mode 100644 index 000000000..590aa40bf --- /dev/null +++ b/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch @@ -0,0 +1,11 @@ +--- kdevelop/kdevdesigner/designer/listeditor.ui.h.ORI 2011-10-30 13:30:56.655489268 +0100 ++++ kdevelop/kdevdesigner/designer/listeditor.ui.h 2011-10-30 13:31:00.782489292 +0100 +@@ -30,7 +30,7 @@ + { + QListViewItem *i = new QListViewItem( listview, listview->lastItem() ); + i->setRenameEnabled( 0, TRUE ); +- tqApp->processEvents(); ++ qApp->processEvents(); + i->startRename( 0 ); + } + diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec index a7504fbe2..6d963ec74 100644 --- a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec +++ b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec @@ -143,7 +143,7 @@ Requires: %{name} = %{version}-%{release} %build -QTDIR="" && source /etc/profile.d/qt.sh +unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" @@ -184,7 +184,6 @@ popd %install %__rm -rf %{buildroot} - %__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0 diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec index 32aef0d43..a3101cdf7 100644 --- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec +++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec @@ -11,6 +11,7 @@ %endif # TDE 3.5.13 specific variables +BuildRequires: cmake >= 2.8 %define tde_libdir %{_libdir}/trinity %define _default_patch_fuzz 2 @@ -24,10 +25,14 @@ Release: %{?release}%{?dist}%{?_variant} License: GPLv2 -URL: http://www.kdevelop.org/ Group: Development/Tools -Prefix: %{_prefix} +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: kdevelop-%{version}.tar.gz Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 @@ -35,7 +40,10 @@ Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KD # RedHat Legacy patches Patch1: c_cpp_reference-2.0.2-config.patch -Patch100: svn.patch +# TDE 3.5.13 patches +## RHEL / Fedora RPM specific patches +Patch2: kdevelop-3.5.13-kdevdesigner-ftbfs.patch + Provides: kdevelop3 = %{version}-%{release} @@ -45,14 +53,13 @@ Requires: %{name}-libs = %{version}-%{release} Requires: trinity-kdelibs-devel Requires: make Requires: perl -#Requires: automake libtool Requires: flex >= 2.5.4 Requires: qt3-designer Requires: gettext Requires: ctags -#BuildRequires: automake libtool -BuildRequires: cmake >= 2.8 +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdelibs-apidocs BuildRequires: qt3-devel-docs @@ -116,8 +123,7 @@ Requires: %{name} = %{version}-%{release} %setup -q -n kdevelop -a1 %patch1 -p0 -b .config - -%patch100 -p1 +%patch2 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! From f16f2e4b84cfb3bd3045ccbcab47277b01550530 Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 30 Oct 2011 18:33:55 +0100 Subject: [PATCH 16/26] TDE 3.5.13 applications for RHEL/Fedora --- .../abakus/trinity-abakus-3.5.13.spec | 97 ++++++++++ .../dolphin/trinity-dolphin-3.5.13.spec | 145 +++++++++++++++ .../filelight/trinity-filelight-3.5.13.spec | 117 +++++++++++++ .../gwenview/trinity-gwenview-3.5.13.spec | 165 ++++++++++++++++++ .../kdiff3/trinity-kdiff3-3.5.13.spec | 122 +++++++++++++ .../krename/trinity-krename-3.5.13.spec | 115 ++++++++++++ .../yakuake/trinity-yakuake-3.5.13.spec | 108 ++++++++++++ 7 files changed, 869 insertions(+) create mode 100644 redhat/applications/abakus/trinity-abakus-3.5.13.spec create mode 100644 redhat/applications/dolphin/trinity-dolphin-3.5.13.spec create mode 100644 redhat/applications/filelight/trinity-filelight-3.5.13.spec create mode 100644 redhat/applications/gwenview/trinity-gwenview-3.5.13.spec create mode 100644 redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec create mode 100644 redhat/applications/krename/trinity-krename-3.5.13.spec create mode 100644 redhat/applications/yakuake/trinity-yakuake-3.5.13.spec diff --git a/redhat/applications/abakus/trinity-abakus-3.5.13.spec b/redhat/applications/abakus/trinity-abakus-3.5.13.spec new file mode 100644 index 000000000..616896d1e --- /dev/null +++ b/redhat/applications/abakus/trinity-abakus-3.5.13.spec @@ -0,0 +1,97 @@ +# Default version for this component +%define kdecomp abakus +%define version 0.91 +%define release 2 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: Calculator for TDE +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: scons +BuildRequires: bison + +%description +AbaKus is a complex calculator, which provides +many different kinds of calculations. +Think of it as bc (the command-line calculator) with a nice GUI. +It also gives information about mathematical variables and +has the user-friendly menu options of a normal KDE application. + +%prep +%setup -q -n applications/%{kdecomp} + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export CXXFLAGS="-I%{_includedir}/tqt" + +./configure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot}%{_prefix} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_datadir}/apps/*/ +%{_datadir}/icons/*/*/*/* +%{tde_docdir}/HTML/*/*/ +%{_datadir}/applnk/Utilities/abakus.desktop + +%Changelog +* Sun Oct 30 2011 Francois Andriot - 0.91-2 +- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 + +* Tue Sep 14 2011 Francois Andriot - 0.91-1 +- Initial build for RHEL 6 and Fedora 15 +- Import to GIT diff --git a/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec b/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec new file mode 100644 index 000000000..1b488e70e --- /dev/null +++ b/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec @@ -0,0 +1,145 @@ +# Default version for this component +%define kdecomp dolphin +%define version 0.9.2 +%define release 3 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: File manager for KDE focusing on usability +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +Dolphin focuses on being only a file manager. +This approach allows to optimize the user +interface for the task of file management. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +# TDE 3.5.12: dirty hack to prevent duplicate line in file 'd3lphin.desktop' +sed -i "%{buildroot}%{_datadir}/applications/kde/d3lphin.desktop" \ + -e "/^Name\[pa\].*/d" + +desktop-file-install --vendor "" \ + --delete-original \ + --dir %{buildroot}%{_datadir}/applications/ \ + %{buildroot}%{_datadir}/applications/kde/d3lphin.desktop + + +## File lists +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + fi +done +fi + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING TODO +%{_bindir}/* +%{_datadir}/applications/*.desktop +%{_datadir}/apps/*/ +%doc %lang(en) %{_docdir}/HTML/en/*/ +%{_datadir}/icons/hicolor/128x128/apps/*.png +%{_datadir}/icons/hicolor/??x??/apps/*.png +%{_datadir}/locale/*/*/d3lphin.mo + + +%Changelog +* Sun Oct 30 2011 Francois Andriot - 0.9.2-3 +- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 + +* Tue Sep 14 2011 Francois Andriot - 0.9.2-2 +- Import to GIT + +* Mon Aug 22 2011 Francois Andriot - 0.9.2-1 +- Correct macro to install under "/opt", if desired + +* Thu Jun 30 2011 Francois Andriot - 0.9.2-0 +- Initial build for RHEL 6.0 +- Based on FC7 'Dolphin 0.8.2-2" SPEC file. + diff --git a/redhat/applications/filelight/trinity-filelight-3.5.13.spec b/redhat/applications/filelight/trinity-filelight-3.5.13.spec new file mode 100644 index 000000000..43878bf0a --- /dev/null +++ b/redhat/applications/filelight/trinity-filelight-3.5.13.spec @@ -0,0 +1,117 @@ +# Default version for this component +%define kdecomp filelight +%define version 1.0 +%define release 3 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: Graphical disk usage display +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + +%description +Filelight creates a complex, but data-rich graphical representation of the files and +directories on your computer. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_datadir}/applications/*/*.desktop +%{_datadir}/apps/*/ +%{_datadir}/icons/*/*/*/* +%{_datadir}/locale/*/*/*.mo +%{_datadir}/config/filelightrc +%{_datadir}/services/*.desktop +%{_docdir}/HTML/*/*/ + +%{_libdir}/*/*.so +%exclude %{_libdir}/*/*.la + +%Changelog +* Sun Oct 30 2011 Francois Andriot - 1.0-3 +- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 + +* Tue Sep 14 2011 Francois Andriot - 1.0-2 +- Import to GIT + +* Wed Aug 24 2011 Francois Andriot - 1.0-1 +- Correct macro to install under "/opt", if desired + +* Sun Aug 14 2011 Francois Andriot - 1.0-0 +- Initial build for RHEL 6.0 + diff --git a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec new file mode 100644 index 000000000..2a33baba9 --- /dev/null +++ b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec @@ -0,0 +1,165 @@ +# Default version for this component +%define kdecomp gwenview +%define version 1.4.2 +%define release 4 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir} +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/kde3 + + +Name: trinity-%{kdecomp} +Summary: Gwenview is an image viewer for KDE. +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + + + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: exiv2-devel + +%if "%{?_prefix}" == "/usr" +Conflicts: kdegraphics +%endif + + +%description +Gwenview is a fast and easy to use image viewer/browser for KDE. +All common image formats are supported, such as PNG(including transparency), +JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp +image format), BMP, XPM and others. Standard features include slideshow, +fullscreen view, image thumbnails, drag'n'drop, image zoom, full network +transparency using the KIO framework, including basic file operations and +browsing in compressed archives, non-blocking GUI with adjustable views. +Gwenview also provides image and directory KParts components for use e.g. in +Konqueror. Additional features, such as image renaming, comparing, +converting, and batch processing, HTML gallery and others are provided by the +KIPI image framework. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make +# %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + + +## File lists +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + fi +done +fi + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_libdir}/*.so.* +%{_datadir}/applications/*/*.desktop +%{_datadir}/services/*.desktop +%{_datadir}/apps/*/ +%{_datadir}/config.kcfg/* +%{tde_docdir}/HTML/en/*/ +%{_datadir}/icons/*/*/*/* +%{_mandir}/man*/* + +%{_libdir}/libkdeinit_gwenview.so +%exclude %{_libdir}/libgwenviewcore.so + +%exclude %{_libdir}/*.la +%exclude %{_libdir}/*/*.so +%exclude %{_libdir}/*/*.la + + + +%Changelog +* Sun Oct 30 2011 Francois Andriot - 1.4.2-4 +- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 + +* Tue Sep 14 2011 Francois Andriot - 1.4.2-3 +- Import to GIT + +* Wed Aug 24 2011 Francois Andriot - 1.4.2-2 +- Add fix for Fedora 15 + +* Mon Aug 22 2011 Francois Andriot - 1.4.2-1 +- Correct macro to install under "/opt", if desired + +* Sat Aug 13 2011 Francois Andriot - 1.4.2-0 +- Initial build for RHEL 6.0 + diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec new file mode 100644 index 000000000..a62ea4bda --- /dev/null +++ b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec @@ -0,0 +1,122 @@ +# Default version for this component +%define kdecomp kdiff3 +%define version 0.9.91 +%define release 3 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + +%description +Shows the differences line by line and character by character (!). +Provides an automatic merge-facility and +an integrated editor for comfortable solving of merge-conflicts. +Supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.). +Unicode & UTF-8 support + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_datadir}/apps/*/ +%{_datadir}/icons/*/*/*/* +%{_datadir}/locale/*/*/*.mo +%{_docdir}/HTML/*/* +%{_datadir}/services/*.desktop +%{tde_libdir}/*.so +%{_datadir}/applnk/Development/*.desktop +%{_datadir}/applnk/.hidden/*.desktop +%{_mandir}/man*/* + +%{tde_libdir}/*.la + +%Changelog +* Sun Oct 30 2011 Francois Andriot - 0.9.91-3 +- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 + +* Tue Sep 14 2011 Francois Andriot - 0.9.91-2 +- Import to GIT + +* Wed Aug 24 2011 Francois Andriot - 0.9.91-1 +- Correct macro to install under "/opt", if desired + +* Sun Aug 14 2011 Francois Andriot - 0.9.91-0 +- Initial build for RHEL 6.0 + diff --git a/redhat/applications/krename/trinity-krename-3.5.13.spec b/redhat/applications/krename/trinity-krename-3.5.13.spec new file mode 100644 index 000000000..9c813486c --- /dev/null +++ b/redhat/applications/krename/trinity-krename-3.5.13.spec @@ -0,0 +1,115 @@ +# Default version for this component +%define kdecomp krename +%define version 3.0.14 +%define release 3 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: A KDE batch file renaming utility. +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: imlib-devel + +%description +KRename is a powerful batch renamer for KDE 3.x. It allows you to easily rename hundreds or +even more files in one go. The filenames can be created by parts of the original filename, +numbering the files or accessing hundreds of informations about the file, like creation date +or Exif informations of an image. + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_datadir}/applications/*/*.desktop +%{_datadir}/apps/*/ +%{_docdir}/HTML/en/*/ +%{_datadir}/icons/*/*/*/* +%{_datadir}/locale/*/*/*.mo + + +%Changelog +* Sun Oct 30 2011 Francois Andriot - 3.0.14-3 +- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 + +* Tue Sep 14 2011 Francois Andriot - 3.0.14-2 +- Import to GIT + +* Wed Aug 24 2011 Francois Andriot - 3.0.14-1 +- Correct macro to install under "/opt", if desired + +* Sun Aug 14 2011 Francois Andriot - 3.0.14-0 +- Initial build for RHEL 6.0 + diff --git a/redhat/applications/yakuake/trinity-yakuake-3.5.13.spec b/redhat/applications/yakuake/trinity-yakuake-3.5.13.spec new file mode 100644 index 000000000..7b49281db --- /dev/null +++ b/redhat/applications/yakuake/trinity-yakuake-3.5.13.spec @@ -0,0 +1,108 @@ +# Default version for this component +%define kdecomp yakuake +%define version 2.8.1 +%define release 3 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: Yakuake is a Quake-style terminal emulator based on KDE Konsole technology. +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + +%description +Yakuake is a Quake-style terminal emulator based on KDE Konsole technology. + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_datadir}/applications/*/*.desktop +%{_datadir}/apps/*/ +%{_datadir}/icons/*/*/*/* +%{_datadir}/locale/*/*/*.mo +%{_datadir}/config.kcfg/*.kcfg + +%Changelog +* Sun Oct 30 2011 Francois Andriot - 2.8.1-3 +- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 + +* Tue Sep 14 2011 Francois Andriot - 2.8.1-2 +- Import to GIT + +* Mon Aug 22 2011 Francois Andriot - 2.8.1-1 +- Correct macro to install under "/opt", if desired + +* Sun Aug 14 2011 Francois Andriot - 2.8.1-0 +- Initial build for RHEL 6.0 + From 0061571b57d37f17c074ba869a674fb774fb49b4 Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 30 Oct 2011 18:36:20 +0100 Subject: [PATCH 17/26] TDE 3.5.13 stable release for RHEL/Fedora --- .../applications/k3b/k3b-i18n-trinity.patch | 7 + .../applications/k3b/trinity-k3b-3.5.12.spec | 9 +- .../applications/k3b/trinity-k3b-3.5.13.spec | 13 +- redhat/components.txt | 12 + .../arts/trinity-arts-3.5.13.spec | 9 +- .../dbus-tqt/dbus-tqt-3.5.13.spec | 7 +- redhat/dependencies/libcaldav/libcaldav.spec | 7 +- .../dependencies/libcarddav/libcarddav.spec | 6 +- redhat/dependencies/qt3/qt3.spec | 1249 +---------------- .../tqtinterface/tqtinterface-3.5.13.spec | 13 +- redhat/genrpm.sh | 2 +- redhat/gentarball.sh | 3 +- redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec | 25 +- .../trinity-kdeaccessibility-3.5.13.spec | 8 +- .../kdeaddons/trinity-kdeaddons-3.5.13.spec | 13 +- redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec | 9 +- .../kdeartwork/trinity-kdeartwork-3.5.13.spec | 9 +- redhat/kdebase/trinity-kdebase-3.5.13.spec | 13 +- .../trinity-kdebindings-3.5.13.spec | 12 +- redhat/kdeedu/trinity-kdeedu-3.5.13.spec | 11 +- redhat/kdegames/trinity-kdegames-3.5.13.spec | 7 +- .../kdegraphics-3.5.13-disable_poppler.patch | 11 + ...raphics-3.5.13-kpovmodeler_check_glu.patch | 16 + ...kdegraphics-3.5.13-ksnapshot_ldflags.patch | 11 + ...raphics-3.5.13-xpdf_disable_mkstemps.patch | 11 + .../trinity-kdegraphics-3.5.13.spec | 117 +- redhat/kdelibs/trinity-kdelibs-3.5.13.spec | 5 +- .../trinity-kdemultimedia-3.5.13.spec | 7 +- .../kdenetwork/trinity-kdenetwork-3.5.13.spec | 11 +- redhat/kdepim/trinity-kdepim-3.5.13.spec | 5 +- redhat/kdesdk/trinity-kdesdk-3.5.13.spec | 6 +- redhat/kdetoys/trinity-kdetoys-3.5.13.spec | 7 +- redhat/kdeutils/trinity-kdeutils-3.5.13.spec | 5 +- redhat/kdevelop/trinity-kdevelop-3.5.13.spec | 7 +- .../kdewebdev/trinity-kdewebdev-3.5.13.spec | 7 +- 35 files changed, 298 insertions(+), 1372 deletions(-) create mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-disable_poppler.patch create mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch create mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch create mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch diff --git a/redhat/applications/k3b/k3b-i18n-trinity.patch b/redhat/applications/k3b/k3b-i18n-trinity.patch index 49ac8a816..0b85e98cf 100644 --- a/redhat/applications/k3b/k3b-i18n-trinity.patch +++ b/redhat/applications/k3b/k3b-i18n-trinity.patch @@ -72,3 +72,10 @@ AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed by kdelibs]) +@@ -1852,7 +1852,7 @@ + fi + + if test -n "$kde_widgetdir"; then +- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" ++ kde_widgetdir="$kde_widgetdir/trinity/plugins/designer" + fi diff --git a/redhat/applications/k3b/trinity-k3b-3.5.12.spec b/redhat/applications/k3b/trinity-k3b-3.5.12.spec index 423655f54..e58543d38 100644 --- a/redhat/applications/k3b/trinity-k3b-3.5.12.spec +++ b/redhat/applications/k3b/trinity-k3b-3.5.12.spec @@ -26,6 +26,9 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %if "%{?_prefix}" == "/usr" Obsoletes: k3b %endif @@ -33,10 +36,6 @@ Obsoletes: k3b Group: Applications/Archiving License: GPLv2+ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - - Source0: k3b-%{version}.tar.gz Source1: k3b-i18n-1.0.5.tar.bz2 Source2: k3brc @@ -62,7 +61,7 @@ BuildRequires: dbus-qt-devel hal-devel BuildRequires: flac-devel BuildRequires: gettext BuildRequires: libdvdread-devel -%if 0%{?fedora} >= 15 || 0%{?rhel} && 0%{?rhel} <= 5 +%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5 BuildRequires: libmpcdec-devel %else BuildRequires: musepack-tools-devel diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec index 59ae57c8e..a40db17d6 100644 --- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec +++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -26,12 +26,16 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %if "%{?_prefix}" == "/usr" Obsoletes: k3b %endif Group: Applications/Archiving License: GPLv2+ + Source0: k3b-%{version}.tar.gz Source1: k3b-i18n-1.0.5.tar.bz2 Source2: k3brc @@ -53,7 +57,7 @@ BuildRequires: dbus-qt-devel hal-devel BuildRequires: flac-devel BuildRequires: gettext BuildRequires: libdvdread-devel -%if 0%{?fedora} >= 15 +%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5 BuildRequires: libmpcdec-devel %else BuildRequires: musepack-tools-devel @@ -92,7 +96,9 @@ start. Summary: Common files of %{name} Group: Applications/Archiving Requires: %{name} = %{version}-%{release} +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 BuildArch: noarch +%endif %description common %{summary}. @@ -240,5 +246,8 @@ update-desktop-database -q &> /dev/null %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sun Sep 11 2011 Francois Andriot - 3.5.13-0 - Import to GIT diff --git a/redhat/components.txt b/redhat/components.txt index 19164cd87..03544ec7e 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -24,3 +24,15 @@ kdeaddons kdewebdev kde-i18n applications/k3b +applications/abakus +applications/dolphin +applications/gwenview +applications/krename +applications/yakuake +#applications/desktop-effects-kde +applications/filelight +applications/kdiff3 +#applications/kuickshow +#applications/basket +#applications/katapult +#compizconfig-backend-kconfig diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec index a8e9f40c9..f0be812f9 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec @@ -1,8 +1,8 @@ # Default version for this component %if "%{?version}" == "" -%define version 1.5.10 +%define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -120,6 +120,9 @@ cd build %changelog -* Fri Sep 02 2011 Francois Andriot - 1.5.10-0 +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Fri Sep 02 2011 Francois Andriot - 3.5.13-0 - Import to GIT - Built with future TDE version (3.5.13 + cmake + QT3.3.8d) diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec index 8e06021d6..9a2be3b1e 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -78,6 +78,9 @@ cd build %{_libdir}/pkgconfig/*.pc %changelog -* Sun Sep 02 2011 Francois Andriot - 3.5.13pre-0 +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Sun Sep 02 2011 Francois Andriot - 3.5.13.0 - Import to GIT - Built with future TDE version (3.5.13 + cmake + QT3.3.8d) diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index 86b0f4c8b..8b505238f 100644 --- a/redhat/dependencies/libcaldav/libcaldav.spec +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -1,6 +1,6 @@ Name: libcaldav Version: 0.6.5 -Release: 2debian2%{?dist} +Release: 2debian2.1%{?dist} Vendor: Trinity Project URL: http://www.trinitydesktop.org/ @@ -17,6 +17,7 @@ Source0: libcaldav_0.6.5-2debian2.tar.gz %if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: libcurl-devel %else +# Specific CURL version for TDE on RHEL 5 (and older) BuildRequires: trinity-libcurl-devel %endif @@ -67,5 +68,5 @@ autoreconf --force --install --symlink %Changelog -* Fri Oct 21 2011 Francois Andriot - 0.6.5-2debian2 -- Initial build for RHEL 6.0 +* Sun Oct 30 2011 Francois Andriot - 0.6.5-2debian2.1 +- Initial build for RHEL 6, RHEL 5, and Fedora 15 diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index ed1ce2a70..a2e8c7310 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -1,6 +1,6 @@ Name: libcarddav Version: 0.6.2 -Release: 2debian2%{?dist} +Release: 2debian2.1%{?dist} Vendor: Trinity Project URL: http://www.trinitydesktop.org/ @@ -66,5 +66,5 @@ autoreconf --force --install --symlink %Changelog -* Fri Oct 21 2011 Francois Andriot - 0.6.5-2debian2 -- Initial build for RHEL 6.0 +* Sun Oct 30 2011 Francois Andriot - 0.6.5-2debian2 .1 +- Initial build for RHEL 6, RHEL 5, and Fedora 15 diff --git a/redhat/dependencies/qt3/qt3.spec b/redhat/dependencies/qt3/qt3.spec index 07485596d..e57d598b5 100644 --- a/redhat/dependencies/qt3/qt3.spec +++ b/redhat/dependencies/qt3/qt3.spec @@ -14,16 +14,21 @@ %define _default_patch_fuzz 2 -Summary: The shared library for the Qt 3 GUI toolkit -Version: %{?version} -Release: 0%{?dist} Name: qt3 -Obsoletes: qt < 1:%{version}-%{release} -Provides: qt = 1:%{version}-%{release} +Version: %{?version} +Release: 1%{?dist} +Summary: The shared library for the Qt 3 GUI toolkit + License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries +URL: http://www.trinitydesktop.org/ +#Url: http://www.troll.no + +Obsoletes: qt < 1:%{version}-%{release} +Provides: qt = 1:%{version}-%{release} + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Url: http://www.troll.no + #Source0: ftp://ftp.troll.no/qt/source/qt-x11-free-3.3.8b.tar.gz Source0: %{name}-%{version}.tar.gz Source2: qt.sh @@ -695,1233 +700,7 @@ rm -rf %{buildroot} %changelog -* Fri Sep 02 2011 Francois Andriot - 3.3.8d-0 +* Fri Sep 02 2011 Francois Andriot - 3.3.8d-1 +- Initial build for RHEL 6, RHEL 5, and Fedora 15 - Switch to Trinity Version - -* Wed Jun 30 2010 Than Ngo - 3.3.8b-29 -- Resolves: bz#605106, XML validity issue, fno-strict-aliasing - -* Thu Sep 10 2009 Than Ngo - 3.3.8b-28 -- drop support fedora < 10 - -* Sun Jul 26 2009 Fedora Release Engineering - 3.3.8b-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri May 15 2009 Rex Dieter - 3.3.8b-26 -- arm patch - -* Thu Apr 16 2009 Rex Dieter - 3.3.8b-25 -- move designer plugins to runtime (#487622) - -* Fri Apr 10 2009 Than Ngo - 3.3.8b-24 -- unneeded executable permissions for profile.d scripts - -* Wed Feb 25 2009 Fedora Release Engineering - 3.3.8b-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Feb 24 2009 Than Ngo - 3.3.8b-22 -- fix build problem against new unixODBC - -* Wed Feb 04 2009 Rex Dieter 3.3.8b-21 -- unowned %%qt_docdir (#483441) - -* Mon Feb 02 2009 Rex Dieter 3.3.8b-20 -- unowned dirs (#483441) - -* Sat Jan 31 2009 Karsten Hopp 3.3.8b-19 -- s390x is 64bit, s390 is 32bit. Fixed in /etc/profile.d/qt.* - -* Thu Jan 22 2009 Rex Dieter 3.3.8b-18 -- respin (mysql) - -* Wed Oct 08 2008 Than Ngo 3.3.8b-17 -- update qt-x11-immodule-unified-qt3 patch - -* Tue Sep 30 2008 Than Ngo 3.3.8b-16 -- mv translations in main package (bz#448761) - -* Sat Sep 20 2008 Kevin Kofler - 3.3.8b-15 -- set _default_patch_fuzz (fixes FTBFS) - -* Mon Jul 07 2008 Rex Dieter - 3.3.8b-14 -- QTDIR isn't set in ppc64 buildroot (#454313) -- /etc/profile.d/qt.sh leaks variable ARCH (#454260) - -* Fri May 23 2008 Than Ngo - 3.3.8b-13 -- fix rh#448027, qt3's PATH not set properly unless qt3-devel is installed - -* Wed Apr 02 2008 Than Ngo - 3.3.8b-12 -- get rid of 0088-fix-xinput-clash.diff, it's fixed in - new xorg-x11-proto-7.3-11 - -* Mon Mar 17 2008 Than Ngo 3.3.8b-11 -- fix obsolete/provides of version/release - -* Thu Mar 13 2008 Kevin Kofler 3.3.8b-10 -- fix %{?epoch:%{epoch}:} idiom not to add a ':' after it - -* Wed Mar 12 2008 Kevin Kofler 3.3.8b-9 -- rename to qt3 on Fedora >= 9 - -* Tue Mar 11 2008 Kevin Kofler 3.3.8b-8 -- prepare for rename to qt3 on Fedora >= 9 (not enabled yet) -- add Provides and Obsoletes everywhere -- update summaries and descriptions -- remove dots at end of Summary tags -- fix non-UTF-8 characters - -* Tue Mar 11 2008 Than Ngo 3.3.8b-7 -- 0088-fix-xinput-clash.diff, fix compile errors with Xmd.h - -* Fri Mar 07 2008 Than Ngo 3.3.8b-6 -- move qt.[c]sh in main package (#221000) - -* Mon Feb 18 2008 Kevin Kofler 3.3.8b-5 -- fix buildkey for GCC 4.3 (#433235) - -* Mon Feb 11 2008 Than Ngo 3.3.8b-4 -- rebuild for GCC 4.3 - -* Thu Jan 24 2008 Than Ngo 3.3.8b-3 -- add LICENSE.GPL2/GPL3 - -* Thu Jan 24 2008 Than Ngo 3.3.8b-2 -- License: GPLv2 or GPLv3 -- merged in 3.3.8b -> drop following patches: - * qt-3.3.6-fontrendering-punjabi-209970.patch - * qt-3.3.6-fontrendering-or_IN-209098.patch - * qt-3.3.6-fontrendering-gu-228451.patch - * qt-font-default-subst.diff - * 0076-fix-qprocess.diff - * 0082-fix-qdatetime-fromstring.diff - * qt-x11-free-3.3.8-bz#243722-mysql.patch - * qt3-CVE-2007-3388.patch - * utf8-bug-qt3-CVE-2007-0242.diff - * qt-3.3.6-bz#292941-CVE-2007-4137.patch - -* Wed Jan 23 2008 Than Ngo 3.3.8b-1 -- update to 3.3.8b, fix License - -* Mon Nov 26 2007 Than Ngo 3.3.8-11 -- add Provides: qt3 = %%version-%%release - -* Wed Nov 7 2007 Stepan Kasal - 3.3.8-10 -- rh#239216, fix a typo in qt-config description - -* Thu Oct 04 2007 Than Ngo - 3.3.8-9 -- rh#309091, qt should provide %%{qtdir}/plugins/styles -- rh#276521, qt-copy patches 0079, 0080, 0082 and 0084 - -* Mon Sep 17 2007 Than Ngo - 3.3.8-8 -- CVE-2007-4137 - -* Wed Aug 29 2007 Than Ngo - 1:3.3.8-7.fc7.1 -- CVE-2007-0242 - -* Tue Aug 28 2007 Than Ngo - 1:3.3.8-7 -- CVE-2007-3388 qt3 format string flaw -- backport to fix #bz243722, bz#244148, Applications using qt-mysql crash if database is - removed before QApplication is destroyed -- cleanup desktop files - -* Mon Apr 23 2007 Than Ngo - 1:3.3.8-5.fc7 -- apply patch to fix fontrendering problem in gu_IN #228451,#228452 - -* Wed Apr 11 2007 Than Ngo - 1:3.3.8-4.fc7 -- adjust qt-3.3.8-fontrendering-as_IN-209972.patch and - qt-3.3.8-fontrendering-#214570.patch for qt-3.3.8 - -* Mon Apr 02 2007 Than Ngo - 1:3.3.8-3.fc7 -- apply patches to fix - Qt UTF-8 overlong sequence decoding vulnerability - QPopupMenu aware of Xinerama - a regression in QProgress::writeToStdin() - -* Tue Mar 27 2007 Than Ngo 1:3.3.8-2.fc7 -- enable tablet support - -* Mon Mar 19 2007 Than Ngo 1:3.3.8-1.fc7 -- update to 3.3.8 - -* Wed Dec 06 2006 Than Ngo - 1:3.3.7-2.fc7 -- Resolves: bz#214371, bn_IN font rendering -- Resolves: bz#217657, ml_IN issue with cursor position -- Resolves: bz#217638, regression bug in qt -- Resolves: bz#209974, Vowel position set properly -- Resolves: bz#214570, Rendering is not fine for 'RA' 09B0 - -* Thu Nov 09 2006 Than Ngo 1:3.3.7-1.fc6 -- update to 3.3.7 -- fix #209097, ml_IN font rendering -- fix #209970, pa font rendering -- fix #209098, or_IN font rendering -- fix #209972, as_IN font rendering -- fix #209975, bn_IN font rendering -- fix #211259, te_IN font rendering -- fix #211436, as_IN font rendering - thanks Sachin Tawniya, LingNing Zhang for the fixes -- move html files to devel -- add sqlite plugin -- fix #189012, qt settings should be readable for other - -* Thu Aug 31 2006 Than Ngo 1:3.3.6-13 -- add missing desktop files - -* Mon Jul 17 2006 Than Ngo 1:3.3.6-12 -- rebuild - -* Wed Jul 12 2006 Jesse Keating - 1:3.3.6-11.1 -- rebuild - -* Mon Jul 10 2006 Than Ngo 1:3.3.6-11 -- apply upstream patches, fix arabic fonts issue, and - problems with missing minimum size when richtext - labels are used - -* Thu Jun 29 2006 Than Ngo 1:3.3.6-10 -- apply patch from Lars, fixes Qt 3.3.6 for Arabic fonts - -* Wed Jun 28 2006 Than Ngo 1:3.3.6-9 -- fix #183302, IM preedit issue in kbabel - -* Mon Jun 26 2006 Than Ngo 1:3.3.6-8 -- rebuilt - -* Thu Jun 08 2006 Than Ngo 1:3.3.6-7 -- fix utf8 issue in changelog -- fix #195410, don't strip binaries/libraries -- fix #156572, keyReleaseEvent issue - -* Mon Jun 05 2006 Than Ngo 1:3.3.6-6 -- qt-devel requires on mesa-libGLU-devel mesa-libGU-devel - -* Tue May 16 2006 Than Ngo 1:3.3.6-5 -- fix #191895, BR libXmu-devel -- disable warnings if debug is off - -* Mon May 15 2006 Than Ngo 1:3.3.6-4 -- fix multilib issue - -* Tue May 09 2006 Than Ngo 1:3.3.6-3 -- add subpackage qt-devel-docs #191099 - -* Thu Apr 13 2006 Than Ngo 1:3.3.6-2 -- fix xorg prefix #188510 - -* Mon Mar 20 2006 Than Ngo 1:3.3.6-1 -- update to 3.3.6 -- adapt qt-x11-immodule-unified-qt3.3.5-20060318 to qt-3.3.6 -- remove set of fixes for the immodule patch, included in qt-x11-immodule-unified-qt3.3.5-20060318 -- remove 0051-qtoolbar_77047.patch, qt-x11-free-3.3.4-assistant_de.patch, - qt-x11-free-3.3.5-warning.patch, included in new upstream - - -* Mon Feb 27 2006 Than Ngo 1:3.3.5-13 -- add set of fixes for the immodule patch, thanks to Dirk Müller - -* Fri Feb 10 2006 Jesse Keating - 1:3.3.5-12.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 1:3.3.5-12.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Tue Jan 17 2006 Than Ngo 1:3.3.5-12 -- add BuildRequires on mesa-libGL-devel - -* Wed Dec 21 2005 Than Ngo 1:3.3.5-11 -- BuildRequires on libXt-devel/xorg-x11-proto-devel - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Sun Nov 13 2005 Than Ngo 1:3.3.5-10 -- workaround for keyboard input action in KHotKeys - -* Tue Nov 08 2005 Than Ngo 1:3.3.5-9 -- fix for modular X - -* Tue Nov 08 2005 Than Ngo 1:3.3.5-8 -- get rid of xorg-x11-devel, fix for modular X - -* Tue Oct 25 2005 Than Ngo 1:3.3.5-7 -- update qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch - -* Mon Oct 24 2005 Than Ngo 1:3.3.5-6 -- update qt-x11-immodule-unified-qt3.3.5-20051018.diff -- remove unneeded qt-x11-immodule-unified-qt3.3.5-20051012-build.patch - -* Thu Oct 13 2005 Than Ngo 1:3.3.5-5 -- update qt-x11-immodule-unified-qt3.3.5-20051012 -- disable some debug messages -- apply patch to fix build problem with the new immodule patch - -* Tue Sep 27 2005 Than Ngo 1:3.3.5-4 -- apply patch to fix gcc warnings - -* Mon Sep 26 2005 Than Ngo 1:3.3.5-3 -- export QTINC/QTLIB, thanks to Rex Dieter (#169132) - -* Tue Sep 20 2005 Than Ngo 1:3.3.5-2 -- German translation of the Qt Assistent #161558 -- add uic workaround - -* Sun Sep 11 2005 Than Ngo 1:3.3.5-1 -- update to 3.3.5 - -* Mon Aug 22 2005 Than Ngo 1:3.3.4-22 -- apply upstream patch to fix kmail folder selector #166430 - -* Mon Aug 15 2005 Than Ngo 1:3.3.4-21 -- fix gcc4 build problem - -* Wed Aug 10 2005 Than Ngo 1:3.3.4-20 -- apply missing patches - -* Wed Aug 10 2005 Than Ngo 1:3.3.4-19 -- apply patch to fix wrong K menu width, #165510 - -* Mon Aug 01 2005 Than Ngo 1:3.3.4-18 -- add visibility patch - -* Wed Jul 20 2005 Than Ngo 1:3.3.4-17 -- fix German translation of the Qt Assistent #161558 - -* Mon Jun 27 2005 Than Ngo 1:3.3.4-16 -- apply patch to fix Rendering for Punjabii, thanks to Trolltech #156504 - -* Tue May 24 2005 Than Ngo 1:3.3.4-15 -- add better fix for #156977, thanks to trolltech -- apply patch to fix keyReleaseEvent problem #156572 - -* Wed May 18 2005 Than Ngo 1:3.3.4-14 -- apply patch to use ecvt, fcvt (thanks to Jakub) -- fix a bug in printing of postscript #156977 - -* Wed May 18 2005 Than Ngo 1:3.3.4-13 -- rebuild - -* Thu Apr 14 2005 Than Ngo 1:3.3.4-12 -- fix bad symlink #154086 - -* Wed Apr 13 2005 Than Ngo 1:3.3.4-11 -- remove bad symlink #154086 -- built with PostgresSQL 8.0.2 - -* Wed Mar 23 2005 Than Ngo 1:3.3.4-10 -- add GtkStyle patch from Peter Backlund #141125 - -* Fri Mar 04 2005 Than Ngo 1:3.3.4-9 -- fix buildkey issue with gcc-4 - -* Fri Mar 04 2005 Than Ngo 1:3.3.4-8 -- rebuilt against gcc-4.0.0-0.31 - -* Tue Mar 01 2005 Than Ngo 1:3.3.4-7 -- fix build problem with gcc4 - -* Mon Feb 28 2005 Than Ngo 1:3.3.4-6 -- rebuilt against gcc-4 - -* Tue Feb 22 2005 Than Ngo 1:3.3.4-5 -- fix application crash when input methode not available (bug #140658) -- remove .moc/.obj -- add qt-copy patch to fix KDE #80072 - -* Fri Feb 11 2005 Than Ngo 1:3.3.4-4 -- update qt-x11-immodule-unified patch - -* Thu Feb 10 2005 Than Ngo 1:3.3.4-3 -- fix rpm file conflict - -* Wed Feb 02 2005 Than Ngo 1:3.3.4-2 -- remove useless doc files #143949 -- fix build problem if installman is disable #146311 -- add missing html/examples/tutorial symlinks - -* Fri Jan 28 2005 Than Ngo 1:3.3.4-1 -- update to 3.3.4 -- adapt many patches to qt-3.3.4 -- drop qt-x11-free-3.3.0-freetype, qt-x11-free-3.3.3-qmake, qt-x11-free-3.3.1-lib64 - qt-x11-free-3.3.3-qimage, which are included in new upstream - -* Tue Nov 30 2004 Than Ngo 1:3.3.3-16 -- add sql macro - -* Mon Nov 29 2004 Than Ngo 1:3.3.3-15 -- convert qdial.3qt to UTF-8 bug #140946 - -* Tue Nov 23 2004 Than Ngo 1:3.3.3-14 -- add missing lupdate and lrelease #140230 - -* Fri Nov 19 2004 Than Ngo 1:3.3.3-13 -- apply patch to fix qinputcontext - -* Thu Nov 11 2004 Than Ngo 1:3.3.3-12 -- link against MySQL 3 -- fix rpm conflict - -* Wed Nov 10 2004 Than Ngo 1:3.3.3-11 -- apply patch to fix fullscreen problem -- remove html documents duplicate #135696 - -* Tue Nov 02 2004 Than Ngo 1:3.3.3-10 -- rebuilt - -* Tue Nov 02 2004 Than Ngo 1:3.3.3-9 -- remove unused patch -- set XIMInputStyle=On The Spot -- require xorg-x11-devel instead XFree86-devel - -* Thu Oct 14 2004 Than Ngo 1:3.3.3-8 -- don't compress examples/tutorial - -* Thu Oct 07 2004 Than Ngo 1:3.3.3-7 -- fix build problem without qt immodule #134918 - -* Tue Sep 28 2004 Than Ngo 1:3.3.3-6 -- fix font problem, bz #133578 - -* Tue Sep 14 2004 Than Ngo 1:3.3.3-4 -- update new immodule patch -- fix multilib problem #132516 - -* Wed Aug 18 2004 Than Ngo 1:3.3.3-3 -- add patch to fix dlopen issue (#126422) -- add image handling fix - -* Thu Aug 12 2004 Than Ngo 1:3.3.3-2 -- fix qmake broken link (#129723) - -* Wed Aug 11 2004 Than Ngo 1:3.3.3-1 -- update to 3.3.3 release - -* Thu Jul 01 2004 Than Ngo 1:3.3.2-10 -- add immodule for Qt - -* Tue Jun 29 2004 Than Ngo 1:3.3.2-9 -- add sub package config, allow multi lib installation (#126643) - -* Thu Jun 24 2004 Than Ngo 1:3.3.2-8 -- add fontconfig fix for qfontdatabase, #123868 -- fix some buildrequires problem, #125289 -- fix dangling symlink, #125351 -- get rid of backup files - -* Tue Jun 15 2004 Elliot Lee 1:3.3.2-7 -- rebuilt - -* Tue May 25 2004 Than Ngo 1:3.3.2-5 -- add missing qembed tool #124052, #124052 -- get rid of unused trigger -- add qt.conf in ld.so.conf.d -> don't change ld.so.conf #124080 - -* Wed May 12 2004 Than Ngo 1:3.3.2-4 -- backport some qt patches, Symbol font works again - -* Mon May 10 2004 Than Ngo 1:3.3.2-3 -- fixed annoying warning - -* Tue May 04 2004 Than Ngo 1:3.3.2-2 -- fix broken symlink at qt document, bug #121652 - -* Thu Apr 29 2004 Than Ngo 3.3.2-1 -- update to 3.3.2 - -* Thu Apr 22 2004 Than Ngo 3.3.1-1 -- add cvs backport -- fix lib64 issue, #121052 -- fix CJK font display, bug #121017, #120542, thanks to Leon Ho -- compress tutorial/examples - -* Fri Mar 26 2004 Than Ngo 3.3.1-0.8 -- fixed symlinks issue, #117572 - -* Thu Mar 25 2004 Than Ngo 3.3.1-0.7 -- add Trolltech patch, fix dpi setting issue - -* Tue Mar 23 2004 Than Ngo 3.3.1-0.6 -- add 0034-qclipboard_recursion_fix.patch from CVS, #118368 -- add better qt-x11-free-3.3.1-fontdatabase.patch - -* Sun Mar 07 2004 Than Ngo 1:3.3.1-0.5 -- disable smpflags - -* Fri Mar 05 2004 Than Ngo 1:3.3.1-0.4 -- fix font alias - -* Thu Mar 04 2004 Than Ngo 1:3.3.1-0.3 -- add fontdatabase fix from Trolltech - -* Thu Mar 04 2004 Than Ngo 1:3.3.1-0.2 -- fix wrong symlink #117451 - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Mon Mar 01 2004 Than Ngo 3.3.1-0.1 -- update to 3.3.1 - -* Mon Feb 23 2004 Than Ngo 3.3.0-0.4 -- add fix for building with freetype 2.1.7 or newer - -* Tue Feb 17 2004 Than Ngo 3.3.0-0.3 -- enable IPv6 support -- use dlopen, instead of linking with OpenGL libraries directly -- don't install backup files - -* Thu Feb 05 2004 Than Ngo 1:3.3.0-0.2 -- fix fontdatabase -- don't use strip in install script -- fix qt default setting - -* Wed Feb 04 2004 Than Ngo 1:3.3.0-0.1 -- 3.3.0 - -* Fri Jan 30 2004 Than Ngo 1:3.2.3-0.4 -- add mouse patch from CVS, bug #114647 - -* Tue Jan 20 2004 Than Ngo 1:3.2.3-0.3 -- rebuild - -* Tue Dec 2 2003 Than Ngo 1:3.2.3-0.2 -- Added missing prl files, (report from trolltech) -- Fixed description -- include requires XFree86-devel on qt-devel - -* Fri Nov 14 2003 Than Ngo 1:3.2.3-0.1 -- 3.2.3 release - -* Thu Oct 30 2003 Than Ngo 1:3.2.2-0.4 -- fix encoding problem - -* Sat Oct 18 2003 Than Ngo 1:3.2.2-0.3 -- fix encoding problem - -* Fri Oct 17 2003 Than Ngo 1:3.2.2-0.2 -- add font alias patch file, thanks to Leon Ho -- clean up monospace.patch from Leon Ho -- remove some unneeded patch files - -* Thu Oct 16 2003 Than Ngo 1:3.2.2-0.1 -- 3.2.2 release -- remove a patch file, which is included in 3.2.2 - -* Tue Oct 14 2003 Than Ngo 1:3.2.1-1.3 -- remove some unneeded patch files -- don't load XLFDs if XFT2 is used - -* Mon Sep 08 2003 Than Ngo 1:3.2.1-1.2 -- fixed rpm file list - -* Tue Sep 02 2003 Than Ngo 1:3.2.1-1.1 -- fix for the khtml form lineedit bug from CVS - -* Wed Aug 27 2003 Than Ngo 1:3.2.1-1 -- 3.2.1 release - -* Wed Jul 23 2003 Than Ngo 1:3.2.0-1 -- 3.2.0 release - -* Mon Jun 23 2003 Than Ngo 3.2.0b2-0.1 -- 3.2.0b2 -- add missing templates for designer - -* Wed Jun 18 2003 Than Ngo 3.2.0b1-0.2 -- clean up specfile - -* Wed Jun 18 2003 Than Ngo 3.2.0b1-0.1 -- 3.2.0b1 - -* Tue Jun 17 2003 Than Ngo 3.1.2-12 -- rebuilt - -* Tue Jun 17 2003 Than Ngo 3.1.2-10 -- add missing translations - -* Wed Jun 11 2003 Elliot Lee -- rebuilt - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Mon May 19 2003 Than Ngo 3.1.2-7 -- add some patches from KDE CVS qt-copy, thanks to Alexei Podtelezhnikov - -* Mon May 5 2003 Than Ngo 3.1.2-5.1 -- set correct permission config scripts - -* Tue Apr 29 2003 Than Ngo 3.1.2-4 -- fix typo bug in font loader - -* Wed Apr 9 2003 Than Ngo 3.1.2-2 -- add xrandr extension - -* Mon Mar 3 2003 Than Ngo 3.1.2-1 -- 3.1.2 release - -* Mon Feb 17 2003 Elliot Lee 3.1.1-7 -- ppc64 support - -* Wed Jan 29 2003 Than Ngo 3.1.1-6 -- add missing Categories section in qt designer #82920 - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Mon Dec 30 2002 Florian La Roche -- Change qmlined.h to not include an attic header that is also not shipped - with Red Hat Linux. This also fixes building unixODBC, that includes this - header (apparently also without needing it). - -* Thu Dec 19 2002 Than Ngo 3.1.1-3 -- add monospace patch file from Leon Ho (bug #79949) -- add small patch file from Sysoltsev Slawa (bug #79731) - -* Tue Dec 17 2002 Than Ngo 3.1.1-2 -- don't require XFree86, it's not needed - -* Tue Dec 17 2002 Than Ngo 3.1.1-1 -- update to 3.1.1 - -* Thu Nov 28 2002 Than Ngo 3.1.0-1.3 -- don't write Date into created moc files - -* Mon Nov 18 2002 Than Ngo 3.1.0-1.2 -- add missing libs -- remove workaround for ppc - -* Sun Nov 17 2002 Than Ngo 3.1.0-1.1 -- adjust qfontdatabase_x11 for 3.1.0 -- fix lib64 issue -- add workaround to build on ppc - -* Wed Nov 13 2002 Than Ngo 3.1.0-1 -- update to 3.1.0 -- adjust some patch files for 3.1.0 -- clean up specfile -- remove some Xft2 patch files, which are now in 3.1.0 -- add qwidget_x11.cpp.diff from Trolltech -- install qt in %%{_libdir}/qt-3.1 (bug #77706) -- don't use rpath -- enable large file support -- use system Xinerama -- remove unneeded cups patch file -- fix to build against new XFree86 - -* Tue Nov 5 2002 Than Ngo 3.0.5-19 -- examples misconfigured (bug #76083) -- don't include pkg-config (bug #74621) -- fix build problem with new XFree86 - -* Tue Sep 17 2002 Than Ngo 3.0.5-18 -- Fixed binaries symlinks - -* Mon Sep 9 2002 Than Ngo 3.0.5-17hammer -- clean up spec file for 64bit machine - -* Thu Aug 29 2002 Than Ngo 3.0.5-17 -- Fixed rpath issue (bug #69692, #69575) -- Removed dlopen patch -- Added monospace alias patch from Leon Ho (bug #72811) -- Added man pages - -* Sun Aug 25 2002 Than Ngo 3.0.5-16 -- Added missing catagory in qt designer -- Added small gb18030 patch file from Leon Ho - -* Thu Aug 22 2002 Bernhard Rosenkraenzer 3.0.5-15 -- Prereq fileutils (#71500) - -* Tue Aug 20 2002 Bernhard Rosenkraenzer 3.0.5-14 -- Don't link to libstdc++, it isn't used -- Work around s390 compiler bug (fpic/fPIC coexistance) -- Do away with the "Feature Bluecurve already defined" warning message -- Remove qmake cache files from the package - -* Wed Aug 14 2002 Than Ngo 3.0.5-13 -- Added fix to use VT100 graphic characters (bug #71364) -- Added fontdatabase fix from llch@redhat.com (bug #68353) - -* Mon Aug 12 2002 Bernhard Rosenkraenzer [not built] -- Fix default qtrc - -* Mon Aug 12 2002 Bernhard Rosenkraenzer 3.0.5-12 -- Fix CJK Printing (#71123) - -* Sun Aug 11 2002 Bernhard Rosenkraenzer 3.0.5-11 -- Move qtconfig from qt-devel to qt, it's generally useful -- Use -fno-use-cxa-atexit -- Some tweaks to allow building Qt/Embedded with the same spec file -- Apply the GB18030 patch even if xft2 isn't set - -* Fri Aug 9 2002 Than Ngo 3.0.5-10 -- Added XIM patch from llch@redhat.com (bug #70411) - -* Sun Aug 4 2002 Than Ngo 3.0.5-9 -- add a missing patch file (closelock/openlock) - -* Thu Aug 1 2002 Bernhard Rosenkraenzer 3.0.5-8 -- Define QT_INSTALL_PREFIX in qmake - -* Thu Aug 1 2002 Bernhard Rosenkraenzer 3.0.5-7 -- Find correct location of qmake mkspecs even if QTDIR isn't set - -* Thu Jul 25 2002 Than Ngo 3.0.5-6 -- Check file descriptor before closelock -* Thu Jul 25 2002 Than Ngo 3.0.5-5 -- Fixed a bug in openlock - -* Wed Jul 24 2002 Than Ngo 3.0.5-4 -- Tiny tweaks to qt3 patch - -* Tue Jul 23 2002 Owen Taylor -- Tiny fix to qt3.diff to not add '0' as a test character (#68964) - -* Mon Jul 22 2002 Tim Powers 3.0.5-2 -- rebuild using gcc-3.2-0.1 - -* Mon Jul 22 2002 Than Ngo 3.0.5-1 -- 3.0.5 -- Fixed dependencies issue - -* Thu Jul 18 2002 Than Ngo 3.0.4-12 -- Added qt-clipfix from Harald Hoyer (bug #67648) - -* Tue Jul 16 2002 Than Ngo 3.0.4-11 -- get rid of qt resource, it's now in redhat-artworks -- add some define to build for 7.3 - -* Thu Jul 11 2002 Than Ngo 3.0.4-10 -- add missing Buildprequires desktop-file-utils -- add patches for GB18030 (llch@redhat.com) bug #68430 - -* Tue Jul 09 2002 Than Ngo 3.0.4-9 -- add new desktop file for qt designer - -* Fri Jul 5 2002 Jakub Jelinek 3.0.4-8 -- compile libXinerama.a with -fpic in Qt until XFree86 is fixed -- make %%xft2 work even if old Xft headers aren't installed - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Tue Jun 18 2002 Bernhard Rosenkraenzer 3.0.4-6 -- Re-enable Xft2 now that fontconfig is fixed -- Require a version of fontconfig that works -- Use -fPIC rather than -fpic on alpha - -* Tue Jun 18 2002 Bernhard Rosenkraenzer 3.0.4-5 -- Revert to Xft1 for now, Xft2 is too unstable -- Exclude alpha for now to work around binutils bugs - -* Tue Jun 11 2002 Bernhard Rosenkraenzer 3.0.4-4 -- Add (and fix up) fontconfig patch - -* Mon Jun 3 2002 Bernhard Rosenkraenzer 3.0.4-3 -- Remove the glweak patch, it isn't needed after dropping XFree86 3.x - -* Thu May 23 2002 Tim Powers -- automated rebuild - -* Sun May 5 2002 Bernhard Rosenkraenzer 3.0.4-1 -- 3.0.4 -- Make SQL plugins optional (buildtime) -- Register with pkgconfig - -* Thu May 02 2002 Than Ngo 3.0.3-12 -- qtdir /usr/lib/qt3 -- build against gcc-3.1-0.26 -- add qt-3.0.3-glweak.patch - -* Wed Apr 17 2002 Bernhard Rosenkraenzer 3.0.3-11 -- qt3-gcc2.96 should be in qt, not qt-devel - -* Mon Apr 15 2002 Bernhard Rosenkraenzer 3.0.3-10 -- Tweaks to allow parallel installations of Qt 3.x (gcc 2.96) and Qt 3.x - (gcc 3.1) -- Fix up debug spewage at Qt designer startup - -* Wed Apr 10 2002 Bernhard Rosenkraenzer 3.0.3-9 -- Spec file fixes - -* Wed Apr 10 2002 Bernhard Rosenkraenzer 3.0.3-8 -- Get rid of non-threaded version, dlopen()'ing threaded code - (like plugins) from non-threaded code is dangerous -- Add some fixes from qt-copy, fixing the ksplash crash some people - have noticed on a first login -- Add translation fixes from CVS -- Patch example .pro files to build outside the Qt source tree (#63023) -- Fix various bugs - -* Thu Apr 04 2002 Leon Ho 3.0.3-7 -- fixes for CJK - qpsprinter -- fixes for CJK - gb18030 - -* Fri Mar 29 2002 Bernhard Rosenkraenzer 3.0.3-6 -- Make sure it builds with both gcc 2.96 and 3.1 - -* Wed Mar 28 2002 Leon Ho 3.0.3-5 -- fixes for CJK - qpsprinter - -* Wed Mar 27 2002 Bernhard Rosenkraenzer 3.0.3-4 -- Add CJK patches - -* Tue Mar 26 2002 Than Ngo 3.0.3-3 -- fix loading kde styles - -* Tue Mar 19 2002 Bernhard Rosenkraenzer 3.0.3-1 -- Update to 3.0.3 final - -* Thu Mar 14 2002 Bernhard Rosenkraenzer 3.0.3-0.cvs20020314.1 -- Update to 3.0.3-pre, required for KDE3 -- force -fPIC usage -- Remove conflict with qt2 < 2.3.2-1, the new qt2 2.3.1 is fixed and qt 2.3.2 - is broken -- Ship the qmake config files (so qmake works for building any 3rd party stuff, - e.g. aethera) - -* Wed Mar 6 2002 Bernhard Rosenkraenzer 3.0.2-2 -- Add some fixes from KDE's qt-copy CVS -- Pluginize image formats - -* Mon Feb 25 2002 Bernhard Rosenkraenzer 3.0.2-1 -- 3.0.2 final - -* Tue Feb 19 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.3 -- Add GB18030 codec patch, #60034 -- Force-build jpeg support, fixing #59775 and #59795 - -* Sat Jan 26 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.2 -- Build with CUPS support - -* Fri Jan 18 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.1 -- Fix up /usr/bin/moc links, they should point to qt3 - -* Mon Jan 14 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020114.1 -- Build styles directly into the main library for now, there's too much broken - code out there depending on this ATM. - -* Wed Jan 9 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020109.1 -- Stop excluding alpha, gcc has been fixed - -* Tue Jan 8 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020108.1 -- Add fixes from CVS; this fixes the "Alt + F1, arrow up, arrow up doesn't work - in KDE" bug - -* Mon Dec 17 2001 Bernhard Rosenkraenzer 3.0.1-2 -- Fix up settings search path -- Add default qtrc allowing to use KDE 3.x Qt plugins -- Make sure QLibrary uses RTLD_GLOBAL when dlopen()ing libraries - -* Thu Dec 13 2001 Bernhard Rosenkraenzer 3.1.0-1 -- Work around gcc bug #57467 - -* Wed Dec 12 2001 Bernhard Rosenkraenzer -- 3.0.1 final - -* Mon Dec 10 2001 Bernhard Rosenkraenzer 3.0.1-0.cvs20011210.1 -- Update to current (needed by KDE 3.x) -- Rebuild with current libstdc++ -- Temporarily disable building on alpha -- Fix build with PostgreSQL 7.2 - -* Mon Nov 26 2001 Bernhard Rosenkraenzer 3.0.0-5 -- Fix up glweak - -* Mon Nov 5 2001 Bernhard Rosenkraenzer 3.0.0-4 -- Give designer, uic, moc, etc. their real names - the qt2 versions - have been renamed in qt2-2.3.2-1. - Conflict with qt2 < 2.3.2-1. - -* Thu Oct 25 2001 Bernhard Rosenkraenzer 3.0.0-3 -- Add symlink /usr/lib/qt-3.0.0 -> /usr/lib/qt3 and set QTDIR to the - symlink, allowing to update to 3.0.1 without breaking rpath'ed binaries - -* Tue Oct 16 2001 Bernhard Rosenkraenzer 3.0.0-1 -- 3.0.0 final -- fix some minor specfile bugs -- Modularize some more (image format plugins) -- Build codecs - -* Tue Sep 18 2001 Bernhard Rosenkraenzer 3.0.0-0.beta5.1 -- beta5 -- Share more code between qt-x11 and qt-embedded builds - -* Wed Aug 29 2001 Bernhard Rosenkraenzer 3.0.0-0.beta4.1 -- beta4 -- build the Motif style directly into Qt rather than as a plugin - Qt should - always have at least one style... -- replace the designer3 symlink with a shell script that sets QTDIR correctly - before launching designer -- Add desktop file for designer - -* Mon Aug 6 2001 Tim Powers 3.0.0-0.beta3.4 -- explicitly include qm2ts, qmake, qtconfig in the devel package file list to avoid dangling symlinks - -* Thu Aug 2 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.3 -- Try yet another workaround for buildsystem breakages - -* Tue Jul 31 2001 Bernhard Rosenkraenzer -- Add another ugly workaround for build system problems, this should finally - get rid of the dangling symlinks - -* Tue Jul 31 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.2 -- Rephrase parts of the spec file, hopefully pleasing the build system - -* Sun Jul 29 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.1 -- beta3 -- Fix dangling symlinks - -* Sun Jun 24 2001 Bernhard Rosenkraenzer 3.0.0-0.beta1.2 -- Fix up QSQL Postgres classes for Postgres 7.1.x -- Fix various bugs: - - QtMultilineEdit and QtTableView should actually compile - - Link libqsqlpsql with libpq - - Don't link the base library with libmysqlclient, linking the MySQL - module with it is sufficient -- Add missing const qualifier -- move the SQL drivers to separate packages to avoid dependencies -- build and install designer plugins - converting glade files to Qt is fun. ;) -- handle RPM_OPT_FLAGS - -* Tue May 22 2001 Bernhard Rosenkraenzer 3.0.0-0.beta1.1 -- 3.0 beta 1 - -* Wed May 16 2001 Bernhard Rosenkraenzer 3.0.0-0.cvs20010516.1 -- Update, remove conflicts with Qt 2.x - -* Mon May 14 2001 Bernhard Rosenkraenzer 3.0.0-0.cvs20010514.1 -- Initial build of 3.0 branch - -* Fri Apr 27 2001 Bernhard Rosenkraenzer 2.3.0-6 -- Fix crashes on ia64, Patch from Bill Nottingham -- Allow building qt-nox - -* Fri Apr 20 2001 Bernhard Rosenkraenzer 2.3.0-5 -- Make sure uic and designer use the libqui from the source tree, not - a previously installed one. - Linking uic-x11 against libqui-embedded is definitely not a feature. ;) -- The qclipboard fix is needed for qt-x11 only, don't apply it if we're - building qt-embedded - -* Sat Apr 14 2001 Bernhard Rosenkraenzer -- Handle LPRng specific constructs in printcap, Bug #35937 - -* Sun Mar 25 2001 Florian La Roche -- add qfont patch from Trolltech - -* Tue Mar 13 2001 Harald Hoyer -- added patch for '@euro' language settings - -* Tue Mar 6 2001 Bernhard Rosenkraenzer -- 2.3.0 final -- BuildRequires XFree86-devel >= 4.0.2 (#30486) - -* Mon Feb 26 2001 Than Ngo -- fix check_env function, so that qt does not crash if QT_XFT is not set -- fix symlinks - -* Mon Feb 26 2001 Bernhard Rosenkraenzer -- 2.3.0b1 -- Add a patch to qpsprinter that handles TrueType fonts even if they come from xfs - -* Tue Feb 13 2001 Preston Brown -- japanese input and clipboard fixes applied. Changes have been sent upstream by patch authors. - -* Fri Feb 9 2001 Bernhard Rosenkraenzer -- Rebuild with new Mesa to get rid of pthreads linkage -- Add Xft fix from KDE CVS - -* Wed Feb 7 2001 Bernhard Rosenkraenzer -- Add printing bugfix patch from Trolltech - -* Sat Feb 3 2001 Bernhard Rosenkraenzer -- 2.2.4 -- Qt Embedded: Add QVfb and VNC support - -* Tue Jan 16 2001 Bernhard Rosenkraenzer -- Don't segfault when running Qt/Embedded applications as root -- Improve the Qt/Embedded sparc patch so we don't need the specfile hacks - anymore -- Fix a bug in QPrintDialog (causing KDE Bug #18608) - -* Thu Jan 11 2001 Bernhard Rosenkraenzer -- bzip2 source to save space -- Qt/Embedded 2.2.3 -- Fix qte build on sparc - -* Wed Dec 20 2000 Bernhard Rosenkraenzer -- Run ldconfig in %%post and %%postun for qt-Xt - -* Sun Dec 17 2000 Bernhard Rosenkraenzer -- Build with the Xrender extension - (Patch from Keith Packard ) - -* Wed Dec 13 2000 Bernhard Rosenkraenzer -- 2.2.3 - -* Tue Dec 12 2000 Bernhard Rosenkraenzer -- Rebuild to fix permissions on doc dir -- Don't exclude ia64 anymore - -* Fri Nov 17 2000 Bernhard Rosenkraenzer -- Fix up uic (Patch from trolltech) - -* Wed Nov 15 2000 Bernhard Rosenkraenzer -- Build qt-embedded - changes to base: fix build, fix ISO C99 compliance, fix 64bit support - -* Mon Nov 13 2000 Bernhard Rosenkraenzer -- 2.2.2 - -* Tue Oct 24 2000 Than Ngo -- call ldconfig for updating (Bug #19687) -- added patch from Trolltech, thanks to Rainer - -* Wed Oct 18 2000 Bernhard Rosenkraenzer -- Add missing msg2qm, msgmerge, qconfig tools (Bug #18997), introduced - by broken Makefiles in base -- fix up %%install so it works both with old-style and new-style fileutils - (fileutils <= 4.0z don't know about -L) - -* Fri Oct 13 2000 Bernhard Rosenkraenzer -- Disable exception handling; this speeds up KDE 2.x and reduces its - memory footprint by 20 MB. - -* Tue Oct 10 2000 Bernhard Rosenkraenzer -- dereference symlinks in include - -* Sun Oct 8 2000 Bernhard Rosenkraenzer -- fix -devel -- update to the new version of 2.2.1 on trolltech.com; the initial tarball - contained broken docs - -* Thu Oct 5 2000 Bernhard Rosenkraenzer -- 2.2.1 - -* Mon Sep 25 2000 Bernhard Rosenkraenzer -- Add missing uic - -* Thu Sep 21 2000 Bernhard Rosenkraenzer -- Move Qt designer to a different source RPM to get rid of a - circular dependency (kdelibs2->qt, qt->kdelibs2) -- Enable MNG support -- Don't compile (just include) examples and tutorials -- move the static libraries to a separate package (qt-static). - They're HUGE, and most people won't ever need them. -- clean up spec file -- fix up dependencies (-devel requires base, -static requires devel, - Xt requires base) -- add BuildRequires line - -* Tue Sep 12 2000 Than Ngo -- update release 2.2.0 -- changed copyright to GPL -- added missing static libraries -- made symbolic link for designer to load the help files correct -- made designer and designer-kde2 as sub packages -- added missing templates for designer -- remove jakub patch, since the release 2.2.0 already - contains this patch. -- fixed qt again to compile with gcc-2.96 -- use make -j for building - -* Wed Aug 23 2000 Bernhard Rosenkraenzer -- Work around compiler bugs (Patch from Jakub) -- Use relative symlinks (Bug #16750) - -* Mon Aug 21 2000 Bernhard Rosenkraenzer -- beta2 - -* Mon Aug 14 2000 Bernhard Rosenkraenzer -- new qt-copy from KDE2 CVS - -* Wed Aug 9 2000 Bernhard Rosenkraenzer -- official beta 1 - -* Thu Aug 3 2000 Than Ngo -- rebuilt against the libpng-1.0.8 - -* Thu Jul 27 2000 Bernhard Rosenkraenzer -- rebuild (so we have it on all arches) - -* Tue Jul 25 2000 Bernhard Rosenkraenzer -- move man pages to a more reasonable place (this fixes Bug #14126) -- exclude ia64 for now (compiler problems!!!) - -* Mon Jul 24 2000 Harald Hoyer -- modified connect patch to fit qt 2.2.0 beta. - -* Thu Jul 20 2000 Bernhard Rosenkraenzer -- update to current qt-copy; this is now a qt 2.2.0 beta. - -* Mon Jul 17 2000 Bernhard Rosenkraenzer -- update to current qt-copy in kde CVS, required - -* Wed Jul 12 2000 Prospector -- automatic rebuild - -* Sun Jul 11 2000 Harald Hoyer -- made patch smaller and binary compatible when recompiled with 6.2 -- modified connect and moc to cope with the new g++ class layout - -* Sun Jul 09 2000 Than Ngo -- rebuilt qt with gcc-2.96-34 - -* Fri Jul 07 2000 Than Ngo -- rebuilt qt with c++ 2.96 - -* Mon Jul 3 2000 Bernhard Rosenkraenzer -- Fix dependancies - -* Sun Jul 2 2000 Bernhard Rosenkraenzer -- Use egcs++ for now ** FIXME - -* Wed Jun 28 2000 Preston Brown -- fix up qt.sh - -* Sun Jun 25 2000 Bernhard Rosenkraenzer -- Build in jpeg and threading support -- Fix a bug in clipboard pasting code - -* Wed Jun 07 2000 Preston Brown -- fix qt.{sh,csh} -- use new rpm macro paths -- package man pages - -* Fri Jun 2 2000 Bill Nottingham -- build without optimization on ia64 - -* Mon May 29 2000 Bernhard Rosenkraenzer -- 2.1.1 - -* Thu May 18 2000 Florian La Roche -- recompile with correct libstdc++ - -* Thu Apr 13 2000 Bernhard Rosenkraenzer -- 2.1.0 final - -* Wed Apr 5 2000 Bernhard Rosenkraenzer -- beta4 -- depend on libGL.so.1 rather than Mesa - XFree86 4.0 provides that - lib, too - -* Wed Mar 22 2000 Bernhard Rosenkraenzer -- beta3 - -* Tue Mar 7 2000 Bernhard Rosenkraenzer -- beta2 -- fix compilation of the NSPlugin add-on - -* Fri Mar 3 2000 Bill Nottingham -- fix %postun script - -* Fri Feb 18 2000 Bernhard Rosenkränzer -- beta1 -- get rid of qt-ImageIO, the functionality is now in the main Qt library -- remove qt-Network, the functionality is now in the main Qt library -- add changes-2.1.0 to %doc - -* Thu Feb 17 2000 Preston Brown -- no refcount check on postun script, we want it to happen even on upgrades - -* Thu Feb 10 2000 Bernhard Rosenkraenzer -- new snapshot, should fix QWhatsThisButton -- remove executable permissions from *.pro files - -* Mon Feb 07 2000 Preston Brown -- strip binaries in examples, tutorial - -* Mon Jan 31 2000 Bernhard Rosenkraenzer -- new snapshot - should fix the hotkey bug -- Fix up the Makefiles so it compiles - -* Tue Jan 18 2000 Bernhard Rosenkraenzer -- new snapshot - we need those QVariant fixes - -* Thu Jan 13 2000 Bernhard Rosenkraenzer -- switch from glxMesa to Mesa for the GL addon - -* Wed Jan 5 2000 Bernhard Rosenkränzer -- Fix up dependencies -- new snapshot - -* Mon Jan 3 2000 Ngo Than -- new snapshot for Red Hat Linux 6.2 -- increase version number - -* Mon Dec 20 1999 Bernhard Rosenkraenzer -- new snapshot -- handle RPM_OPT_FLAGS - -* Mon Dec 13 1999 Bernhard Rosenkraenzer -- new snapshot -- -GL requires libGL.so.1 instead of Mesa (might as well be glxMesa - or some commercial OpenGL) -- -GL BuildPrereqs /usr/X11R6/include/GL/gl.h instead of Mesa-devel - (might as well be glxMesa or some commercial OpenGL) - -* Sun Dec 05 1999 Bernhard Rosenkraenzer -- update to current RSYNC version -- remove compilation patch - it finally works out of the box - -* Wed Oct 27 1999 Bernhard Rosenkraenzer -- update to current CVS snapshot -- build extensions -- add patch to fix QNetwork compilation - -* Sun Oct 24 1999 Bernhard Rosenkraenzer -- current CVS snapshot -- fix compilation with gcc 2.95.x -- use install -c rather than just install to make BSD install happy - -* Mon Oct 11 1999 Bernhard Rosenkraenzer -- 2.1.0 snapshot (for KDE2) -- Fix typo in spec - -* Thu Sep 23 1999 Preston Brown -- don't ship tutorial or example binaries - -* Tue Sep 21 1999 Preston Brown -- substitution in tutorial and examples so that dependencies are correct and - they can be successfully rebuilt. -- switched to completely using QTDIR. trying to coexist with links into - /usr/{include,lib} and still compile with qt 1.x is very hard for - configure scripts to cope with. - -* Thu Aug 19 1999 Preston Brown -- implemented QTDIR compatibility. - -* Tue Jul 20 1999 Preston Brown -- qt 2.0.1 packaged. - -* Wed Jul 14 1999 Preston Brown -- Qt 2.00 packaged. -- examples, html documentation, tutorial moved to /usr/doc - -* Sat Apr 17 1999 Preston Brown -- static library supplied in dev package. - -* Wed Apr 07 1999 Preston Brown -- turn on internal GIF reading support - -* Tue Apr 06 1999 Preston Brown -- strip binaries - -* Mon Mar 15 1999 Preston Brown -- upgrade to qt 1.44. - -* Wed Feb 24 1999 Preston Brown -- Injected new description and group. - -* Tue Jan 19 1999 Preston Brown -- moved includes to /usr/include/qt - -* Mon Jan 04 1999 Preston Brown -- made setup phase silent. - -* Fri Dec 04 1998 Preston Brown -- upgraded to qt 1.42, released today. - -* Tue Dec 01 1998 Preston Brown -- took Arnts RPM and made some minor changes for Red Hat. +- Spec file based on RHEL 6 'qt3-3.3.8b-29' diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec index d1a56fa18..6f65fa7bf 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -80,18 +80,14 @@ cd build %__mkdir_p %{?buildroot}%{_includedir} %__make install DESTDIR=%{?buildroot} -C build -# RHEL 5: add newline at end of include files +# RHEL 5: add newline at end of include files to avoid warnings %if 0%{?rhel} && 0%{?rhel} <= 5 for i in %{?buildroot}%{_includedir}/*.h; do echo "" >>${i} done %endif -# Fix 'tqt.pc': UIC executable is not correct -#sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \ -# -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,' - -# Install 'cmake' modules for a specific package (for later use) +# Install 'cmake' modules for development use %__mkdir_p %{?buildroot}%{cmake_modules_dir} for i in cmake/modules/*.cmake; do install -m 644 $i %{?buildroot}%{cmake_modules_dir} @@ -113,6 +109,9 @@ done %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sun Aug 28 2011 Francois Andriot - 3.5.13-0 - Import to GIT - Built with future TDE version (3.5.13 + cmake + QT3.3.8d) diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index 1a57dd898..4fca9b93e 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -21,7 +21,7 @@ EOF exit 1 fi -select COMP in $( cut -f1 "components.txt" ) ; do +select COMP in $( cut -f1 "components.txt" | grep -v "^#" ) ; do # Gets package version from 'components.txt' file VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt ) diff --git a/redhat/gentarball.sh b/redhat/gentarball.sh index 9715cffd0..76d902fd5 100755 --- a/redhat/gentarball.sh +++ b/redhat/gentarball.sh @@ -15,7 +15,7 @@ EOF ##### CHOOSE A TDE COMPONENT ##### PS3="Enter number: " -select COMP in $( cut -f1 components.txt ) ; do +select COMP in $( cut -f1 components.txt | grep -v "^#" ) ; do ARCHIVEDIR="${PWD}/${COMP}" [ -d "${ARCHIVEDIR}" ] || mkdir -p "${ARCHIVEDIR}" @@ -67,6 +67,7 @@ select COMP in $( cut -f1 components.txt ) ; do ;; "qt3") echo "Extracting '${COMP}' from GIT ..." + ARCHIVENAME="qt3-3.3.8d.tar.gz" git clone http://scm.trinitydesktop.org/scm/git/tde; mv tde/main/dependencies/qt3 . ;; *) diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec index 0fe1bfc89..3783612a7 100644 --- a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec +++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -1224,26 +1224,11 @@ rm -rf %{buildroot} %endif %changelog -* Mon Sep 19 2011 Francois Andriot - 3.5.12-7 -- Add support for RHEL5 +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 -* Sun Sep 11 2011 Francois Andriot - 3.5.12-6 -- Re-introduce all languages - -* Wed Aug 24 2011 Francois Andriot - 3.5.12-5 -- Re-introduce all languages - -* Mon Aug 22 2011 Francois Andriot - 3.5.12-4 -- Correct macro to install under "/opt", if desired - -* Thu Jul 21 2011 Francois Andriot - 3.5.12-3 -- Add 'Patch1': translation for 'Open Terminal Here...' background shortcut - -* Sun Dec 19 2010 Francois Andriot - 3.5.12-2 -- Rebuilt - -* Sun Dec 19 2010 Francois Andriot - 3.5.12-0 +* Sun Dec 19 2010 Francois Andriot - 3.5.13-0 - Initial version (French language only) - Based on RHEL SPEC file 'kde-i18n' - Add 'patch0' to reflect modifications in 'kdesu' from 'kdebase' package - +- Import to GIT diff --git a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec index e582df583..e996a7261 100644 --- a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec +++ b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -184,7 +184,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sun Sep 11 2011 Francois Andriot - 3.5.13-0 -- Initial build for RHEL 6 -- Spec file based on Fedora 8 "kdeaccessibility-3.5.10-1" - Import to GIT +- Spec file based on Fedora 8 "kdeaccessibility-3.5.10-1" diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec index d5cb516b9..b5ed3eda0 100644 --- a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec +++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -38,8 +38,6 @@ Source2: metabarrc Patch3: kdeaddons-3.5.3-sdl.patch -Patch100: svn.patch - BuildRequires: trinity-kdebase-devel BuildRequires: trinity-kdegames-devel BuildRequires: trinity-kdemultimedia-devel @@ -86,8 +84,6 @@ This package includes: %patch3 -p1 -b .sdl -%patch100 -p2 - # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! sed -i admin/acinclude.m4.in \ @@ -252,6 +248,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog -* Sat Oct 29 2011 Francois Andriot - 3.5.12-3 -- Initial build for RHEL 6 +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Sat Oct 29 2011 Francois Andriot - 3.5.13-0 +- Import to GIT diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec index 3fa5b78a5..abc5006ca 100644 --- a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec +++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -193,6 +193,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog -* Fri Oct 29 2011 Francois Andriot - 3.5.13-0 -- Initial build for RHEL 6 +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Fri Oct 28 2011 Francois Andriot - 3.5.13-0 +- Import to GIT diff --git a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec index 1f48d1611..3603f7378 100644 --- a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec +++ b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -42,7 +42,11 @@ Source1: webcollagerc BuildRequires: gettext BuildRequires: trinity-kdebase-devel BuildRequires: nas-devel esound-devel jack-audio-connection-kit-devel +%if 0%{?rhel} > 5 || 0%{?fedora} >= 15 BuildRequires: xscreensaver +%else +BuildRequires: gnome-screensaver +%endif %if "%{?with_libart}" == "1" BuildRequires: libart_lgpl-devel %endif @@ -176,5 +180,8 @@ done %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sun Sep 11 2011 Francois Andriot - 3.5.13-0 - Import to GIT diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index 70285a44c..fa2c9bf38 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -41,8 +41,6 @@ Source0: kdebase-%{version}.tar.gz # Wrapper script to prevent Plasma launch at Trinity Startup Source1: plasma-desktop -Patch100: svn.patch - # TDE for RHEL/Fedora specific patches # [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch @@ -162,8 +160,6 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch5 -p1 %patch6 -p1 -%patch100 -p1 - %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -223,7 +219,7 @@ mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysg # TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4 %if "%{?_prefix}" != "/usr" -%{__cp} -f "%{SOURCE1}" "%{?buildroot}%{_bindir}" +%__cp -f "%{SOURCE1}" "%{?buildroot}%{_bindir}" %endif %clean @@ -489,6 +485,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/cmake/*.cmake %changelog -* Sat Sep 03 2011 Francois Andriot - 3.5.12.99-0 +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Sat Sep 03 2011 Francois Andriot - 3.5.13-0 - Import to GIT - Use TDE 3.5.13, cmake, QT3.3.3.8d diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec index d395d44fb..7b1b74f69 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -29,11 +29,10 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ -Source0: kdebindings-%{version}.tar.gz - Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: kdebindings-%{version}.tar.gz # RedHat Legacy patches (from Fedora) Patch1: kdebindings-3.5.6-libgcj.patch @@ -257,8 +256,8 @@ update-desktop-database >& /dev/null ||: # Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6) %if "%{?_prefix}" == "/usr" %exclude %{_bindir}/kjscmd -%exclude %{_mandir}/man1/kjscmd* %endif +%exclude %{_mandir}/man1/kjscmd* %files dcopperl -f %{name}-dcopperl.list @@ -278,6 +277,9 @@ update-desktop-database >& /dev/null ||: %{ruby_arch}/*.la %changelog -* Sat Sep 03 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Sat Sep 03 2011 Francois Andriot & /dev/null ||: %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sat Sep 09 2011 Francois Andriot - 3.5.13-0 -- Initial build for RHEL 6 +- Import to GIT diff --git a/redhat/kdegames/trinity-kdegames-3.5.13.spec b/redhat/kdegames/trinity-kdegames-3.5.13.spec index 14d8d0f55..97e64fb35 100644 --- a/redhat/kdegames/trinity-kdegames-3.5.13.spec +++ b/redhat/kdegames/trinity-kdegames-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -192,5 +192,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sat Sep 09 2011 Francois Andriot - 3.5.13-0 -- Initial build for RHEL 6 +- Import to GIT diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-disable_poppler.patch b/redhat/kdegraphics/kdegraphics-3.5.13-disable_poppler.patch new file mode 100644 index 000000000..502972e7b --- /dev/null +++ b/redhat/kdegraphics/kdegraphics-3.5.13-disable_poppler.patch @@ -0,0 +1,11 @@ +--- kdegraphics.ORI/kfile-plugins/dependencies/CMakeLists.txt 2011-07-31 08:24:04.000000000 +0200 ++++ kdegraphics/kfile-plugins/dependencies/CMakeLists.txt 2011-10-30 14:42:03.000000000 +0100 +@@ -9,4 +9,6 @@ + # + ################################################# + +-add_subdirectory( poppler-tqt ) +\ Pas de fin de ligne à la fin du fichier. ++if( WITH_PDF ) ++ add_subdirectory( poppler-tqt ) ++endif ( ) diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch b/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch new file mode 100644 index 000000000..ba18d0b3d --- /dev/null +++ b/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch @@ -0,0 +1,16 @@ +diff -Nuar kdegraphics.ORI/kpovmodeler/ConfigureChecks.cmake kdegraphics/kpovmodeler/ConfigureChecks.cmake +--- kdegraphics.ORI/kpovmodeler/ConfigureChecks.cmake 2011-05-11 22:40:19.000000000 +0200 ++++ kdegraphics/kpovmodeler/ConfigureChecks.cmake 2011-10-30 14:00:54.000000000 +0100 +@@ -12,7 +12,10 @@ + # glu + pkg_search_module( GLU glu ) + if( NOT GLU_FOUND ) +- tde_message_fatal( "glu is required, but was not found on your system" ) ++ check_include_file ( GL/glu.h HAVE_GLU ) ++ if( NOT HAVE_GLU ) ++ tde_message_fatal( "glu is required, but was not found on your system" ) ++ endif ( ) + endif( ) + + +kfile-plugins/dependencies/poppler-tqt/CMakeFiles/poppler-tqt-shared.dir/build.make diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch b/redhat/kdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch new file mode 100644 index 000000000..c0e6e3da2 --- /dev/null +++ b/redhat/kdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch @@ -0,0 +1,11 @@ +diff -Nuar kdegraphics.ORI/ksnapshot/CMakeLists.txt kdegraphics/ksnapshot/CMakeLists.txt +--- kdegraphics.ORI/ksnapshot/CMakeLists.txt 2011-05-11 23:29:40.000000000 +0200 ++++ kdegraphics/ksnapshot/CMakeLists.txt 2011-10-31 15:45:47.107958154 +0100 +@@ -40,6 +40,6 @@ + SOURCES + ksnapshotiface.skel main.cpp ksnapshot.cpp regiongrabber.cpp + windowgrabber.cpp ksnapshotwidget.ui +- LINK kdeprint-shared ++ LINK kdeprint-shared Xext + DESTINATION ${BIN_INSTALL_DIR} + ) diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch b/redhat/kdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch new file mode 100644 index 000000000..a531fb03d --- /dev/null +++ b/redhat/kdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch @@ -0,0 +1,11 @@ +--- kdegraphics.ORI/kpdf/xpdf/aconf.h 2011-04-27 19:32:57.000000000 +0200 ++++ kdegraphics/kpdf/xpdf/aconf.h 2011-10-30 14:54:24.000000000 +0100 +@@ -7,7 +7,7 @@ + #define HAVE_FREETYPE_FREETYPE_H HAVE_FREETYPE + #define OPI_SUPPORT 0 + #define TEXTOUT_WORD_LIST 0 +-#define HAVE_MKSTEMPS 1 //libkdefakes provides it ++#define HAVE_MKSTEMPS 0 + #define HAVE_SPLASH 1 + #define SPLASH_CMYK 1 + #define HAVE_XPDFCORE 0 diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec index b988eddca..2133f4ddf 100644 --- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec +++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -12,10 +12,16 @@ # TDE 3.5.13 specific building variables BuildRequires: cmake >= 2.8 -%define tde_docdir %{_docdir} +%define tde_docdir %{_docdir}/kde %define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity +# KDEGRAPHICS specific options +%if 0%{?rhel} && 0%{?rhel} <= 5 +%define build_kpovmodeler 0 +%else +%define build_kpovmodeler 1 +%endif Name: trinity-kdegraphics Version: %{?version} @@ -30,8 +36,21 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source0: kdegraphics-%{version}.tar.gz +# TDE 3.5.13 +## RHEL / Fedora specific patches +### [kdegraphics/ksnapshot] Missing -lXext in LDFLAGS (required for Fedora 15) +Patch0: kdegraphics-3.5.13-ksnapshot_ldflags.patch +### [kdegraphics/kpovmodeler] CMAKE does not detect GL/glu.h (on RHEL5) +Patch1: kdegraphics-3.5.13-kpovmodeler_check_glu.patch +### [kdegraphics/kfile-plugins/dependencies/poppler-tqt] Compile 'poppler-tqt' only if HAVE_POPPLER_016 +Patch2: kdegraphics-3.5.13-disable_poppler.patch +### [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5 +Patch3: kdegraphics-3.5.13-xpdf_disable_mkstemps.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel @@ -44,6 +63,8 @@ BuildRequires: automake libtool BuildRequires: gphoto2-devel BuildRequires: sane-backends-devel BuildRequires: libusb-devel +BuildRequires: t1lib-devel +BuildRequires: libdrm-devel # kgamma BuildRequires: libXxf86vm-devel @@ -53,7 +74,10 @@ BuildRequires: imlib-devel BuildRequires: OpenEXR-devel # kpdf BuildRequires: freetype-devel +BuildRequires: poppler-devel +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 BuildRequires: poppler-qt-devel +%endif BuildRequires: libpaper-devel # ksvg BuildRequires: fontconfig-devel @@ -61,8 +85,11 @@ BuildRequires: fribidi-devel BuildRequires: lcms-devel BuildRequires: libart_lgpl-devel BuildRequires: libXmu-devel + # kpovmodeler +%if 0%{?build_kpovmodeler} BuildRequires: libGL-devel libGLU-devel libXi-devel +%endif Requires: tqtinterface Requires: trinity-arts @@ -108,7 +135,9 @@ Requires(postun): /sbin/ldconfig %{summary}, including: * kfax * kfaxview +%if 0%{?build_kpovmodeler} * kpovmodler +%endif %package libs Summary: %{name} runtime libraries @@ -123,49 +152,44 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n kdegraphics - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%if 0%{?rhel} && 0%{?rhel} <= 5 +%patch3 -p1 +%endif %build unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" - -%configure \ - --enable-new-ldflags \ - --disable-dependency-tracking \ - --disable-rpath \ - --disable-debug \ - --disable-warnings \ - --enable-final \ - --enable-closure \ - --includedir=%{_includedir}/kde \ - --with-extra-includes=%{_includedir}/tqt - -%if 0%{?fedora} >= 15 -# Ugly fix for kolourpaint - problem when linking libkdefx.so -sed -i kolourpaint/Makefile \ - -e 's,\($(kolourpaint_LINK) $(kolourpaint_OBJECTS) $(kolourpaint_LDADD) \)\($(LIBS)\),\1 -lkdefx \2,' - -# Another ugly fix for kpdf - problem when linking fontconfig -sed -i kpdf/Makefile \ - -e '/^LDFLAGS = .*/ s,$, -lfontconfig,' +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" +export LD_LIBRARY_PATH="%{_libdir}" + +%__mkdir build +cd build +%cmake \ + -DWITH_T1LIB=ON \ + -DWITH_LIBPAPER=ON \ + -DWITH_TIFF=ON \ + -DWITH_OPENEXR=ON \ +%if 0%{?rhel} && 0%{?rhel} <= 5 + -DWITH_PDF=OFF \ +%else + -DWITH_PDF=ON \ +%endif + -DBUILD_ALL=ON \ +%if 0%{?build_kpovmodeler} == 0 + -DBUILD_KPOVMODELER=OFF \ %endif + .. %__make %{?_smp_mflags} %install export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} - -make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build # locale's %find_lang %{name} || touch %{name}.lang @@ -201,7 +225,7 @@ rm -f %{buildroot}/libkpovmodeler.so %clean -rm -rf %{buildroot} +%__rm -rf %{buildroot} %post @@ -263,8 +287,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/services/kfaxmultipage_tiff.desktop # kpovmodeler +%if 0%{?build_kpovmodeler} %doc rpmdocs/kpovmodeler/ -%doc %{_docdir}/HTML/en/kpovmodeler/ +%doc %{tde_docdir}/HTML/en/kpovmodeler/ %{_bindir}/kpovmodeler %{_libdir}/libkpovmodeler.so.* %{_libdir}/libkpovmodeler.la @@ -273,6 +298,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/apps/kpovmodeler/ %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* %{_datadir}/icons/hicolor/*/apps/kpovmodeler.* +%endif %files -f %{name}.lang %defattr(-,root,root,-) @@ -297,6 +323,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/services/kfaxmultipage_tiff.desktop # kpovmodeler +%if 0%{?build_kpovmodeler} %exclude %{tde_docdir}/HTML/en/kpovmodeler/ %exclude %{_bindir}/kpovmodeler %exclude %{_libdir}/libkpovmodeler.* @@ -305,6 +332,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/apps/kpovmodeler/ %exclude %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* %exclude %{_datadir}/icons/hicolor/*/apps/kpovmodeler.* +%endif %{_bindir}/* %{_datadir}/applications/kde/*.desktop @@ -317,12 +345,15 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/mimelnk/*/* %{_libdir}/libkdeinit_*.so %{tde_libdir}/* +%doc %lang(en) %{tde_docdir}/HTML/en/* %files libs %defattr(-,root,root,-) %exclude %{_libdir}/libkfaximage.la +%if 0%{?build_kpovmodeler} %exclude %{_libdir}/libkpovmodeler.la %exclude %{_libdir}/libkpovmodeler.so.* +%endif %{_libdir}/lib*.so.* %{_libdir}/lib*.la # Why ??? @@ -330,7 +361,15 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files devel %defattr(-,root,root,-) -%{_includedir}/kde/* +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 +%{tde_includedir}/* +%endif +%{_includedir}/dom/* +%{_includedir}/ksvg/* +%{_includedir}/kviewshell/* +%{_includedir}/libtext2path-0.1/* +%{_includedir}/kmultipageInterface.h +%{_datadir}/cmake/*.cmake %{_libdir}/lib*.so #exclude %{_libdir}/libkpovmodeler.so %exclude %{_libdir}/libkfaximage.so @@ -338,5 +377,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libdjvu.so %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 +- RHEL 5 build has some features disabled (see patches) + * Sun Sep 11 2011 Francois Andriot - 3.5.13-0 - Import to GIT diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index 056229f1c..404a432c7 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -281,6 +281,9 @@ EOF %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Wed Sep 02 2011 Francois Andriot - 3.5.13pre.svn20110902-0.el6 - Import to GIT - Built with future TDE version (3.5.13 + cmake + QT3.3.8d) diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index 0eda9a831..8d19e5159 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -394,6 +394,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sat Sep 09 2011 Francois Andriot - 3.5.13-0 -- Initial build for RHEL 6 +- Import to GIT - Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2" diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec index a991df2c8..d06c7b328 100644 --- a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec +++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -60,8 +60,6 @@ Patch4: kdenetwork-3.2.3-resolv.patch # include more/proper ppp headers Patch6: kdenetwork-3.5.9-krfb_httpd.patch -Patch100: svn.patch - Requires: %{name}-libs = %{version}-%{release} BuildRequires: gettext @@ -181,8 +179,6 @@ Requires: %{name} = %{version}-%{release} %patch4 -p1 -b .resolv %patch6 -p1 -b .krfb_httpd -%patch100 -p1 - %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -469,6 +465,9 @@ done %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Tue Oct 25 2011 Francois Andriot - 3.5.13-0 -- Initial version +- Import to GIT diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec index 670eb0e92..e19bcf338 100644 --- a/redhat/kdepim/trinity-kdepim-3.5.13.spec +++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -144,5 +144,8 @@ export PATH="%{_bindir}:${PATH}" %{_datadir}/cmake/*.cmake %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Mon Sep 05 2011 Francois Andriot - 3.5.12-0 - Import to GIT diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec index 2563ec93a..2caf50a01 100644 --- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec +++ b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -213,6 +213,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Mon Sep 05 2011 Francois Andriot - 3.5.13-0 - Import to GIT -- Built with future TDE version (3.5.13 + cmake + QT3.3.8d) diff --git a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec index ef533a8db..f9ef1f207 100644 --- a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec +++ b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -157,6 +157,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Fri Oct 28 2011 Francois Andriot - 3.5.13-0 -- Initial version for RHEL 6 and Fedora 15 +- Import to GIT diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec index f58564dda..0e6777148 100755 --- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec +++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -339,6 +339,9 @@ done %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Mon Sep 05 2011 Francois Andriot - 3.5.13-0 - Import to GIT diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec index a3101cdf7..969f6bab5 100644 --- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec +++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -229,6 +229,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sat Oct 29 2011 Francois Andriot - 3.5.13-0 -- Initial build for RHEL 6 and Fedora 15 +- Import to GIT - Based on SPEC file from Fedora: kdevelop 9:3.5.3-1 diff --git a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec index ea89ce3ae..53acedb23 100644 --- a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec +++ b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -224,5 +224,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Mon Sep 19 2011 Francois Andriot - 3.5.13-0 -- Initial build for RHEL 6 / Fedora 15 +- Import to GIT From 8ad5f8901297e11bd05eb48488b6315aae50de0b Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 30 Oct 2011 21:55:14 +0100 Subject: [PATCH 18/26] Fix TDE 3.5.13 package dependencies --- redhat/components.txt | 1 + .../trinity-kdemultimedia-3.5.13.spec | 11 ++- redhat/kdepim/trinity-kdepim-3.5.13.spec | 15 ++- redhat/trinity-desktop/trinity-desktop.spec | 94 +++++++++++++++++++ 4 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 redhat/trinity-desktop/trinity-desktop.spec diff --git a/redhat/components.txt b/redhat/components.txt index 03544ec7e..3c0de8dbb 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -4,6 +4,7 @@ dependencies/qt3 dependencies/tqtinterface dependencies/dbus-tqt dependencies/arts +trinity-desktop kdelibs kdebase kdebindings diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index 8d19e5159..a57642152 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -54,8 +54,10 @@ Provides: kdemultimedia3 = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} -BuildRequires: zlib-devel +BuildRequires: trinity-arts-devel BuildRequires: trinity-kdelibs-devel + +BuildRequires: zlib-devel BuildRequires: libvorbis-devel BuildRequires: audiofile-devel BuildRequires: desktop-file-utils @@ -350,6 +352,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_libdir}/mcop/* %{_libdir}/libkdeinit_*.so #%{_libdir}/liboggarts.so +%{_libdir}/libmpeg-0.3.0.so +%{_libdir}/libyafcore.so +%{_libdir}/libyafxplayer.so %{tde_libdir}/* %{_libdir}/kconf_update_bin/* %{_bindir}/* @@ -391,7 +396,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libnoatunarts.* #exclude %{_libdir}/liboggarts.so %exclude %{_libdir}/libwinskinvis.so - +%exclude %{_libdir}/libmpeg-0.3.0.so +%exclude %{_libdir}/libyafcore.so +%exclude %{_libdir}/libyafxplayer.so %changelog * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec index e19bcf338..2e5b04d8d 100644 --- a/redhat/kdepim/trinity-kdepim-3.5.13.spec +++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec @@ -31,9 +31,9 @@ Prefix: %{_prefix} Source0: kdepim-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tqtinterface -BuildRequires: trinity-arts -BuildRequires: trinity-kdelibs +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-kdelibs-devel BuildRequires: gpgme-devel BuildRequires: libgpg-error-devel BuildRequires: flex @@ -46,6 +46,10 @@ BuildRequires: libcarddav-devel %if 0%{?fedora} >= 15 BuildRequires: flex-static +%else +%if 0%{?rhel} <= 5 +BuildRequires: trinity-libcurl-devel +%endif %endif Requires: trinity-kdelibs @@ -98,7 +102,8 @@ cd build -DBUILD_ALL=ON \ .. -%__make %{?_smp_mflags} +# Do not use %{?_smp_mflags} ! +%__make %install export PATH="%{_bindir}:${PATH}" @@ -130,6 +135,7 @@ export PATH="%{_bindir}:${PATH}" %{_libdir}/kconf_update_bin/* %{_libdir}/libakregatorprivate.so %{_libdir}/libkmailprivate.so +%{_libdir}/libkmobiledevice.so %{tde_docdir}/HTML/en/* %files devel @@ -141,6 +147,7 @@ export PATH="%{_bindir}:${PATH}" %{tde_libdir}/plugins/designer/*.la %exclude %{_libdir}/libakregatorprivate.so %exclude %{_libdir}/libkmailprivate.so +%exclude %{_libdir}/libkmobiledevice.so %{_datadir}/cmake/*.cmake %changelog diff --git a/redhat/trinity-desktop/trinity-desktop.spec b/redhat/trinity-desktop/trinity-desktop.spec new file mode 100644 index 000000000..86b9c018e --- /dev/null +++ b/redhat/trinity-desktop/trinity-desktop.spec @@ -0,0 +1,94 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +Name: trinity-desktop +Version: %{version} +Release: %{?release}%{?dist}%{?_variant} +License: GPL +Summary: Meta-package to install TDE +Group: User Interface/Desktops + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +Requires: trinity-kdeaccessibility >= %{version} +Requires: trinity-kdeaddons >= %{version} +Requires: trinity-kdeadmin >= %{version} +Requires: trinity-kdeartwork >= %{version} +Requires: trinity-kdeartwork-icons >= %{version} +Requires: trinity-kdebase >= %{version} +Requires: trinity-kdebindings >= %{version} +Requires: trinity-kdeedu >= %{version} +Requires: trinity-kdegames >= %{version} +Requires: trinity-kdegraphics >= %{version} +Requires: trinity-kdemultimedia >= %{version} +Requires: trinity-kdenetwork >= %{version} +Requires: trinity-kdepim >= %{version} +Requires: trinity-kdeutils >= %{version} +Requires: trinity-kdetoys >= %{version} + +%description +The TDE project aims to keep the KDE3.5 computing style alive, as well as +polish off any rough edges that were present as of KDE 3.5.10. Along +the way, new useful features will be added to keep the environment +up-to-date. +Toward that end, significant new enhancements have already been made in +areas such as display control, network connectivity, user +authentication, and much more! + +%package dev +Group: User Interface/Desktops +Summary: Meta-package to install TDE development tools + +Requires: trinity-kdesdk >= %{version} +Requires: trinity-kdevelop >= %{version} +Requires: trinity-kdewebdev >= %{version} + +%description dev +%{summary} + +%package extras +Group: User Interface/Desktops +Summary: Meta-package to install extra TDE packages + +Requires: trinity-kdeaddons-extras >= %{version} +Requires: trinity-kdebase-extras >= %{version} +Requires: trinity-kdegraphics-extras >= %{version} +Requires: trinity-kdemultimedia-extras >= %{version} +Requires: trinity-kdenetwork-extras >= %{version} +Requires: trinity-kdeutils-extras >= %{version} + +%description extras +%{summary} + +%package all +Group: User Interface/Desktops +Summary: Meta-package to install all TDE packages + +Requires: %{name} == %{version} +Requires: %{name}-dev == %{version} +Requires: %{name}-extras == %{version} + +%description all +%{summary} + + +%files + +%files dev + +%files all From 22f1373d3e0c69b54532e118571e46a3e2c9b7a6 Mon Sep 17 00:00:00 2001 From: albator Date: Mon, 31 Oct 2011 09:58:18 +0100 Subject: [PATCH 19/26] Add meta package "trinity-desktop" for RHEL/Fedora --- redhat/trinity-desktop/trinity-desktop.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/redhat/trinity-desktop/trinity-desktop.spec b/redhat/trinity-desktop/trinity-desktop.spec index 86b9c018e..cf9a96d22 100644 --- a/redhat/trinity-desktop/trinity-desktop.spec +++ b/redhat/trinity-desktop/trinity-desktop.spec @@ -91,4 +91,6 @@ Requires: %{name}-extras == %{version} %files dev +%files extras + %files all From 8695886e97b271cba9f587a94d5ee8368a11a6db Mon Sep 17 00:00:00 2001 From: albator Date: Mon, 31 Oct 2011 19:18:15 +0100 Subject: [PATCH 20/26] TDE 3.5.13 final more small fixes before release (RHEL/Fedora) --- .../gwenview-3.5.13-jpegint-ftbfs.patch | 254 ++++++++++++++++++ .../gwenview/trinity-gwenview-3.5.13.spec | 4 + redhat/components.txt | 1 + redhat/dependencies/libcaldav/libcaldav.spec | 7 +- .../dependencies/libcarddav/libcarddav.spec | 7 +- redhat/kdebase/pamd.kcheckpass-trinity.el5 | 9 + redhat/kdebase/pamd.kcheckpass-trinity.el6 | 5 + redhat/kdebase/pamd.kcheckpass-trinity.fc15 | 5 + redhat/kdebase/pamd.kdm-trinity-np.el5 | 11 + redhat/kdebase/pamd.kdm-trinity-np.el6 | 13 + redhat/kdebase/pamd.kdm-trinity-np.fc15 | 15 ++ redhat/kdebase/pamd.kdm-trinity.el5 | 10 + redhat/kdebase/pamd.kdm-trinity.el6 | 16 ++ redhat/kdebase/pamd.kdm-trinity.fc15 | 18 ++ redhat/kdebase/pamd.kscreensaver-trinity.el5 | 9 + redhat/kdebase/pamd.kscreensaver-trinity.el6 | 5 + redhat/kdebase/pamd.kscreensaver-trinity.fc15 | 5 + redhat/kdebase/trinity-kdebase-3.5.13.spec | 20 ++ 18 files changed, 412 insertions(+), 2 deletions(-) create mode 100644 redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch create mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.el5 create mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.el6 create mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.fc15 create mode 100644 redhat/kdebase/pamd.kdm-trinity-np.el5 create mode 100644 redhat/kdebase/pamd.kdm-trinity-np.el6 create mode 100644 redhat/kdebase/pamd.kdm-trinity-np.fc15 create mode 100644 redhat/kdebase/pamd.kdm-trinity.el5 create mode 100644 redhat/kdebase/pamd.kdm-trinity.el6 create mode 100644 redhat/kdebase/pamd.kdm-trinity.fc15 create mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.el5 create mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.el6 create mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.fc15 diff --git a/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch b/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch new file mode 100644 index 000000000..0cd290983 --- /dev/null +++ b/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch @@ -0,0 +1,254 @@ +diff -Nuar gwenview.ORI/src/imageutils/jpegint.h gwenview/src/imageutils/jpegint.h +--- gwenview.ORI/src/imageutils/jpegint.h 2011-05-26 23:04:57.000000000 +0200 ++++ gwenview/src/imageutils/jpegint.h 2011-11-01 20:45:15.494165195 +0100 +@@ -43,9 +43,9 @@ + + /* Master control module */ + struct jpeg_comp_master { +- JTQT_METHOD(void, prepare_for_pass, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, pass_startup, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo)); ++ JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo)); ++ JMETHOD(void, pass_startup, (j_compress_ptr cinfo)); ++ JMETHOD(void, finish_pass, (j_compress_ptr cinfo)); + + /* State variables made visible to other modules */ + boolean call_pass_startup; /* True if pass_startup must be called */ +@@ -54,16 +54,16 @@ + + /* Main buffer control (downsampled-data buffer) */ + struct jpeg_c_main_controller { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); +- JTQT_METHOD(void, process_data, (j_compress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); ++ JMETHOD(void, process_data, (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JDIMENSION *in_row_ctr, + JDIMENSION in_rows_avail)); + }; + + /* Compression preprocessing (downsampling input buffer control) */ + struct jpeg_c_prep_controller { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); +- JTQT_METHOD(void, pre_process_data, (j_compress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); ++ JMETHOD(void, pre_process_data, (j_compress_ptr cinfo, + JSAMPARRAY input_buf, + JDIMENSION *in_row_ctr, + JDIMENSION in_rows_avail, +@@ -74,23 +74,23 @@ + + /* Coefficient buffer control */ + struct jpeg_c_coef_controller { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); +- JTQT_METHOD(boolean, compress_data, (j_compress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); ++ JMETHOD(boolean, compress_data, (j_compress_ptr cinfo, + JSAMPIMAGE input_buf)); + }; + + /* Colorspace conversion */ + struct jpeg_color_converter { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, color_convert, (j_compress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo)); ++ JMETHOD(void, color_convert, (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf, + JDIMENSION output_row, int num_rows)); + }; + + /* Downsampling */ + struct jpeg_downsampler { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, downsample, (j_compress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo)); ++ JMETHOD(void, downsample, (j_compress_ptr cinfo, + JSAMPIMAGE input_buf, JDIMENSION in_row_index, + JSAMPIMAGE output_buf, + JDIMENSION out_row_group_index)); +@@ -100,9 +100,9 @@ + + /* Forward DCT (also controls coefficient quantization) */ + struct jpeg_forward_dct { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo)); ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo)); + /* perhaps this should be an array??? */ +- JTQT_METHOD(void, forward_DCT, (j_compress_ptr cinfo, ++ JMETHOD(void, forward_DCT, (j_compress_ptr cinfo, + jpeg_component_info * compptr, + JSAMPARRAY sample_data, JBLOCKROW coef_blocks, + JDIMENSION start_row, JDIMENSION start_col, +@@ -111,23 +111,23 @@ + + /* Entropy encoding */ + struct jpeg_entropy_encoder { +- JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics)); +- JTQT_METHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data)); +- JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo)); ++ JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics)); ++ JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data)); ++ JMETHOD(void, finish_pass, (j_compress_ptr cinfo)); + }; + + /* Marker writing */ + struct jpeg_marker_writer { +- JTQT_METHOD(void, write_file_header, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, write_frame_header, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, write_scan_header, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, write_file_trailer, (j_compress_ptr cinfo)); +- JTQT_METHOD(void, write_tables_only, (j_compress_ptr cinfo)); ++ JMETHOD(void, write_file_header, (j_compress_ptr cinfo)); ++ JMETHOD(void, write_frame_header, (j_compress_ptr cinfo)); ++ JMETHOD(void, write_scan_header, (j_compress_ptr cinfo)); ++ JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo)); ++ JMETHOD(void, write_tables_only, (j_compress_ptr cinfo)); + /* These routines are exported to allow insertion of extra markers */ + /* Probably only COM and APPn markers should be written this way */ +- JTQT_METHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker, ++ JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker, + unsigned int datalen)); +- JTQT_METHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val)); ++ JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val)); + }; + + +@@ -135,8 +135,8 @@ + + /* Master control module */ + struct jpeg_decomp_master { +- JTQT_METHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, finish_output_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo)); + + /* State variables made visible to other modules */ + boolean is_dummy_pass; /* True during 1st pass for 2-pass quant */ +@@ -144,10 +144,10 @@ + + /* Input control module */ + struct jpeg_input_controller { +- JTQT_METHOD(int, consume_input, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, reset_input_controller, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, finish_input_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(int, consume_input, (j_decompress_ptr cinfo)); ++ JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo)); ++ JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo)); + + /* State variables made visible to other modules */ + boolean has_multiple_scans; /* True if file has multiple scans */ +@@ -156,18 +156,18 @@ + + /* Main buffer control (downsampled-data buffer) */ + struct jpeg_d_main_controller { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); +- JTQT_METHOD(void, process_data, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); ++ JMETHOD(void, process_data, (j_decompress_ptr cinfo, + JSAMPARRAY output_buf, JDIMENSION *out_row_ctr, + JDIMENSION out_rows_avail)); + }; + + /* Coefficient buffer control */ + struct jpeg_d_coef_controller { +- JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(int, consume_data, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, start_output_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(int, decompress_data, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(int, consume_data, (j_decompress_ptr cinfo)); ++ JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(int, decompress_data, (j_decompress_ptr cinfo, + JSAMPIMAGE output_buf)); + /* Pointer to array of coefficient virtual arrays, or NULL if none */ + jvirt_barray_ptr *coef_arrays; +@@ -175,8 +175,8 @@ + + /* Decompression postprocessing (color quantization buffer control) */ + struct jpeg_d_post_controller { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); +- JTQT_METHOD(void, post_process_data, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); ++ JMETHOD(void, post_process_data, (j_decompress_ptr cinfo, + JSAMPIMAGE input_buf, + JDIMENSION *in_row_group_ctr, + JDIMENSION in_row_groups_avail, +@@ -187,12 +187,12 @@ + + /* Marker reading & parsing */ + struct jpeg_marker_reader { +- JTQT_METHOD(void, reset_marker_reader, (j_decompress_ptr cinfo)); ++ JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo)); + /* Read markers until SOS or EOI. + * Returns same codes as are defined for jpeg_consume_input: + * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI. + */ +- JTQT_METHOD(int, read_markers, (j_decompress_ptr cinfo)); ++ JMETHOD(int, read_markers, (j_decompress_ptr cinfo)); + /* Read a restart marker --- exported for use by entropy decoder only */ + jpeg_marker_parser_method read_restart_marker; + +@@ -207,8 +207,8 @@ + + /* Entropy decoding */ + struct jpeg_entropy_decoder { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(boolean, decode_mcu, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo, + JBLOCKROW *MCU_data)); + + /* This is here to share code between baseline and progressive decoders; */ +@@ -217,21 +217,21 @@ + }; + + /* Inverse DCT (also performs dequantization) */ +-typedef JTQT_METHOD(void, inverse_DCT_method_ptr, ++typedef JMETHOD(void, inverse_DCT_method_ptr, + (j_decompress_ptr cinfo, jpeg_component_info * compptr, + JCOEFPTR coef_block, + JSAMPARRAY output_buf, JDIMENSION output_col)); + + struct jpeg_inverse_dct { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); + /* It is useful to allow each component to have a separate IDCT method. */ + inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS]; + }; + + /* Upsampling (note that upsampler must also call color converter) */ + struct jpeg_upsampler { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, upsample, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, upsample, (j_decompress_ptr cinfo, + JSAMPIMAGE input_buf, + JDIMENSION *in_row_group_ctr, + JDIMENSION in_row_groups_avail, +@@ -244,20 +244,20 @@ + + /* Colorspace conversion */ + struct jpeg_color_deconverter { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, color_convert, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, color_convert, (j_decompress_ptr cinfo, + JSAMPIMAGE input_buf, JDIMENSION input_row, + JSAMPARRAY output_buf, int num_rows)); + }; + + /* Color quantization or color precision reduction */ + struct jpeg_color_quantizer { +- JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan)); +- JTQT_METHOD(void, color_quantize, (j_decompress_ptr cinfo, ++ JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan)); ++ JMETHOD(void, color_quantize, (j_decompress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPARRAY output_buf, + int num_rows)); +- JTQT_METHOD(void, finish_pass, (j_decompress_ptr cinfo)); +- JTQT_METHOD(void, new_color_map, (j_decompress_ptr cinfo)); ++ JMETHOD(void, finish_pass, (j_decompress_ptr cinfo)); ++ JMETHOD(void, new_color_map, (j_decompress_ptr cinfo)); + }; + + diff --git a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec index 2a33baba9..e709120d5 100644 --- a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec +++ b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec @@ -33,9 +33,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# TDE 3.5.13 on RHEL/Fedora specific patches +Patch0: gwenview-3.5.13-jpegint-ftbfs.patch BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel BuildRequires: desktop-file-utils @@ -63,6 +66,7 @@ KIPI image framework. %prep %setup -q -n applications/%{kdecomp} +%patch0 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! diff --git a/redhat/components.txt b/redhat/components.txt index 3c0de8dbb..ee194d47e 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -5,6 +5,7 @@ dependencies/tqtinterface dependencies/dbus-tqt dependencies/arts trinity-desktop +trinity-settings kdelibs kdebase kdebindings diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index 8b505238f..6624409cd 100644 --- a/redhat/dependencies/libcaldav/libcaldav.spec +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -1,6 +1,11 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%endif + Name: libcaldav Version: 0.6.5 -Release: 2debian2.1%{?dist} +Release: 2debian2.1%{?dist}%{?_variant} Vendor: Trinity Project URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index a2e8c7310..c47f40a49 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -1,6 +1,11 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%endif + Name: libcarddav Version: 0.6.2 -Release: 2debian2.1%{?dist} +Release: 2debian2.1%{?dist}%{?_variant} Vendor: Trinity Project URL: http://www.trinitydesktop.org/ diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.el5 b/redhat/kdebase/pamd.kcheckpass-trinity.el5 new file mode 100644 index 000000000..56939d5a9 --- /dev/null +++ b/redhat/kdebase/pamd.kcheckpass-trinity.el5 @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session required pam_loginuid.so +session optional pam_selinux.so +session optional pam_console.so diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.el6 b/redhat/kdebase/pamd.kcheckpass-trinity.el6 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/kdebase/pamd.kcheckpass-trinity.el6 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.fc15 b/redhat/kdebase/pamd.kcheckpass-trinity.fc15 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/kdebase/pamd.kcheckpass-trinity.fc15 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/kdebase/pamd.kdm-trinity-np.el5 b/redhat/kdebase/pamd.kdm-trinity-np.el5 new file mode 100644 index 000000000..8dc8ef34d --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity-np.el5 @@ -0,0 +1,11 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_nologin.so +auth required pam_permit.so +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session include system-auth +session required pam_loginuid.so +session optional pam_selinux.so +session optional pam_console.so diff --git a/redhat/kdebase/pamd.kdm-trinity-np.el6 b/redhat/kdebase/pamd.kdm-trinity-np.el6 new file mode 100644 index 000000000..c3f7172de --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity-np.el6 @@ -0,0 +1,13 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth diff --git a/redhat/kdebase/pamd.kdm-trinity-np.fc15 b/redhat/kdebase/pamd.kdm-trinity-np.fc15 new file mode 100644 index 000000000..96fcfe378 --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity-np.fc15 @@ -0,0 +1,15 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/kdebase/pamd.kdm-trinity.el5 b/redhat/kdebase/pamd.kdm-trinity.el5 new file mode 100644 index 000000000..30a26ae99 --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity.el5 @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session include system-auth +session required pam_loginuid.so +session optional pam_selinux.so +session optional pam_console.so diff --git a/redhat/kdebase/pamd.kdm-trinity.el6 b/redhat/kdebase/pamd.kdm-trinity.el6 new file mode 100644 index 000000000..14f4aa748 --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity.el6 @@ -0,0 +1,16 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +auth optional pam_gnome_keyring.so +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session optional pam_gnome_keyring.so auto_start +session include system-auth diff --git a/redhat/kdebase/pamd.kdm-trinity.fc15 b/redhat/kdebase/pamd.kdm-trinity.fc15 new file mode 100644 index 000000000..f1d90f7f3 --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity.fc15 @@ -0,0 +1,18 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +auth optional pam_gnome_keyring.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session optional pam_gnome_keyring.so auto_start +session include system-auth +session include postlogin diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.el5 b/redhat/kdebase/pamd.kscreensaver-trinity.el5 new file mode 100644 index 000000000..56939d5a9 --- /dev/null +++ b/redhat/kdebase/pamd.kscreensaver-trinity.el5 @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session required pam_loginuid.so +session optional pam_selinux.so +session optional pam_console.so diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.el6 b/redhat/kdebase/pamd.kscreensaver-trinity.el6 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/kdebase/pamd.kscreensaver-trinity.el6 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.fc15 b/redhat/kdebase/pamd.kscreensaver-trinity.fc15 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/kdebase/pamd.kscreensaver-trinity.fc15 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index fa2c9bf38..64b3dffc0 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -41,6 +41,13 @@ Source0: kdebase-%{version}.tar.gz # Wrapper script to prevent Plasma launch at Trinity Startup Source1: plasma-desktop +# Pam configuration files for RHEL / Fedora +Source2: pamd.kdm-trinity%{?dist} +Source3: pamd.kdm-trinity-np%{?dist} +Source4: pamd.kcheckpass-trinity%{?dist} +Source5: pamd.kscreensaver-trinity%{?dist} + + # TDE for RHEL/Fedora specific patches # [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch @@ -196,6 +203,9 @@ cd build -DWITH_I8K=OFF \ -DWITH_HAL=ON \ -DBUILD_ALL=ON \ + -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \ + -DKDM_PAM_SERVICE="kdm-trinity" \ + -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \ .. %__make %{?_smp_mflags} @@ -222,6 +232,13 @@ mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysg %__cp -f "%{SOURCE1}" "%{?buildroot}%{_bindir}" %endif +# PAM configuration files +%__mkdir_p "%{?buildroot}%{_sysconfdir}/pam.d" +%__install -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity" +%__install -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np" +%__install -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" +%__install -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity" + %clean %__rm -rf %{?buildroot} @@ -309,6 +326,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/applnk/Utilities/kpager.desktop %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png +# Pam configuration +%{_sysconfdir}/pam.d/* + %doc AUTHORS COPYING README %{tde_docdir}/HTML/en/* %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde From 9867fcbf8cecdd2bcdef4eaa288d173dccff1059 Mon Sep 17 00:00:00 2001 From: albator Date: Mon, 31 Oct 2011 23:02:16 +0100 Subject: [PATCH 21/26] kdebase 3.5.13: global Xsession script is /etc/X11/xinit/Xsession under RHEL/Fedora, not /etc/X11/Xsession. --- .../kdebase-3.5.13-genkdmconf_Xsession_location.patch | 11 +++++++++++ redhat/kdebase/trinity-kdebase-3.5.13.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch diff --git a/redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch b/redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch new file mode 100644 index 000000000..d0efe3ef8 --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch @@ -0,0 +1,11 @@ +--- kdebase/kdm/kfrontend/genkdmconf.c.ORI 2011-11-01 21:59:14.450046357 +0100 ++++ kdebase/kdm/kfrontend/genkdmconf.c 2011-11-01 21:59:34.449045801 +0100 +@@ -676,7 +676,7 @@ + " ;;\n" + "esac\n" + "# invoke global X session script\n" +-". /etc/X11/Xsession\n"; ++". /etc/X11/xinit/Xsession\n"; + + static const char def_background[] = + "[Desktop0]\n" diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index 64b3dffc0..9675530b0 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -53,8 +53,10 @@ Source5: pamd.kscreensaver-trinity%{?dist} Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch # [kdebase/kdesktop] Modifies "open terminal here" on desktop Patch5: kdebase-3.5.12-desktop-openterminalhere.patch -# [kdebase/kioslave]: Forces HAL backend to use HAL mount options +# [kdebase/kioslave] Forces HAL backend to use HAL mount options Patch6: kdebase-3.5.12-halmountoptions.patch +# [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession' +Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel @@ -92,6 +94,8 @@ Requires: qt%{?_qt_suffix} Requires: openssl Requires: avahi avahi-qt3 Requires: dbus-tqt +# Provides the global Xsession script (/etc/X11/xinit/Xsession) +Requires: xorg-x11-xinit # RHEL 6 Configuration files are provided in separate packages @@ -166,6 +170,7 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch3 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build From 66a82fee884dcf547ebb3b8f4afe23740c03cc12 Mon Sep 17 00:00:00 2001 From: albator Date: Tue, 1 Nov 2011 18:37:48 +0100 Subject: [PATCH 22/26] TDE 3.5.13: add french translations --- redhat/genrpm.sh | 2 + ...-i18n-3.5.13-add_french_translations.patch | 468 ++++++++++++++++++ redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec | 17 +- 3 files changed, 482 insertions(+), 5 deletions(-) create mode 100644 redhat/kde-i18n/kde-i18n-3.5.13-add_french_translations.patch diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index 4fca9b93e..eb7015de2 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -1,6 +1,7 @@ #!/bin/bash cd "$( dirname "$0" )" +ARGS="$@" clear cat <&1 | tee /tmp/log set +x diff --git a/redhat/kde-i18n/kde-i18n-3.5.13-add_french_translations.patch b/redhat/kde-i18n/kde-i18n-3.5.13-add_french_translations.patch new file mode 100644 index 000000000..3239d6917 --- /dev/null +++ b/redhat/kde-i18n/kde-i18n-3.5.13-add_french_translations.patch @@ -0,0 +1,468 @@ +diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcmiccconfig.po kde-i18n-fr-3.5.10/messages/kdebase/kcmiccconfig.po +--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcmiccconfig.po 1970-01-01 01:00:00.000000000 +0100 ++++ kde-i18n-fr-3.5.10/messages/kdebase/kcmiccconfig.po 2011-11-01 17:01:47.942636702 +0100 +@@ -0,0 +1,76 @@ ++# TDE 3.5.13 'iccconfig.cpp' translation ++ ++#: iccconfig.cpp:82 ++msgid "The global ICC color profile is a system wide setting, and requires administrator access
To alter the system's global ICC profile, click on the \"Administrator Mode\" button below." ++msgstr "Le profil de couleurs ICC global est un réglage système, et nécessite les droits d'administrateur.
Pour modifier le profil ICC global, cliquez sur le bouton \"Mode administrateur\" ci-dessous." ++ ++#: iccconfig.cpp:155 ++#: iccconfig.cpp:189 ++msgid "Please enter the new profile name below:" ++msgstr "Veuillez indiquer le nom du nouveau profil:" ++ ++#: iccconfig.cpp:159 ++#: iccconfig.cpp:193 ++msgid "ICC Profile Configuration" ++msgstr "Configuration du profil ICC" ++ ++#: iccconfig.cpp:166 ++#: iccconfig.cpp:200 ++msgid "Error: A profile with that name already exists" ++msgstr "Erreur: Il existe déja un profil portant ce nom." ++ ++#: iccconfig.cpp:406 ++msgid "" ++"

ICC Profile Configuration

This module allows you to configure KDE support" ++" for ICC profiles. This allows you to easily color correct your monitor" ++" for a more lifelike and vibrant image." ++msgstr "" ++"

Configuration du profil ICC

Ce module vous permet de configurer le support" ++" ICC de Trinity. Il permet de calibrer les couleurs de votre moniteur, " ++" afin d'obtenir une image plus vivante et plus vibrante." ++ ++#: iccconfigbase.ui:31 ++msgid "ICC Color Profile Configuration" ++msgstr "Configuration des profils de couleurs ICC" ++ ++#: iccconfigbase.ui:42 ++msgid "System Settings" ++msgstr "Paramètres Système" ++ ++#: iccconfigbase.ui:53 ++msgid "&Enable global ICC color profile support" ++msgstr "Activer le profil ICC global" ++ ++#: iccconfigbase.ui:61 ++#: iccconfigbase.ui:148 ++msgid "*.icc|ICC Standard Color Profiles (*.icc)\n*.icm|Windows(R) Color Profiles (*.icm)" ++msgstr "*.icc|Profils de couleurs ICC standards (*.icc)\n*.icm|Profils de couleurs Windows(R) (*.icm)" ++ ++#: iccconfigbase.ui:69 ++#: iccconfigbase.ui:156 ++msgid "ICC File" ++msgstr "Fichier ICC" ++ ++#: iccconfigbase.ui:79 ++msgid "User Settings" ++msgstr "Paramètres Utilisateurs" ++ ++#: iccconfigbase.ui:90 ++msgid "&Enable user ICC color profile support" ++msgstr "Activer le profil ICC utilisateur" ++ ++#: iccconfigbase.ui:103 ++msgid "Current Profile" ++msgstr "Profil actuel" ++ ++#: iccconfigbase.ui:111 ++msgid "Create New" ++msgstr "Créer" ++ ++#: iccconfigbase.ui:119 ++msgid "Rename" ++msgstr "Renommer" ++ ++#: iccconfigbase.ui:140 ++msgid "Settings for output" ++msgstr "Appliquer à la sortie" +diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesktop.po kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po +--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesktop.po 2008-08-19 20:29:30.000000000 +0200 ++++ kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po 2011-11-01 17:14:54.379412830 +0100 +@@ -1144,3 +1144,20 @@ + "Cependant, certains écrans de veille\n" + " effectuent des calculs utiles, dans ces cas, il est souhaitable de ne " + "pas les désactiver." ++ ++### TDE 3.5.13 ### ++#: lockdlg.cc:109 ++msgid "Desktop Session Locked" ++msgstr "Session de bureau verrouillée" ++ ++#: lockdlg.cc:128 ++msgid "This computer is in use and has been locked." ++msgstr "Cet ordinateur est en cours d'utilisation et a été verrouillé." ++ ++#: lockdlg.cc:129 ++msgid "Only '%1' may unlock this session." ++msgstr "Seul '%1' peut déverouiller cette session." ++ ++#: lockdlg.cc:139 ++msgid "This session has been locked since %1" ++msgstr "Cette session est verrouillée depuis %1" +diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kicker.po kde-i18n-fr-3.5.10/messages/kdebase/kicker.po +--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kicker.po 2008-08-19 20:29:30.000000000 +0200 ++++ kde-i18n-fr-3.5.10/messages/kdebase/kicker.po 2011-11-01 16:16:16.453636429 +0100 +@@ -754,3 +754,8 @@ + #, no-c-format + msgid "Custom size" + msgstr "Taille personnalisée" ++ ++### TDE 3.5.13 ### ++#: panelextension.cpp:385 ++msgid "&Launch Process Manager..." ++msgstr "Gestionnaire de taches..." +diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/konsole.po kde-i18n-fr-3.5.10/messages/kdebase/konsole.po +--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/konsole.po 2008-08-19 20:29:30.000000000 +0200 ++++ kde-i18n-fr-3.5.10/messages/kdebase/konsole.po 2011-11-01 16:16:16.453636429 +0100 +@@ -1475,3 +1475,8 @@ + #: zmodem_dialog.cpp:28 + msgid "&Stop" + msgstr "A&rrêter" ++ ++### TDE 3.5.13 ### ++#: konsole.cpp:736 ++msgid "&Open.." ++msgstr "Ouvrir.." +diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/krandr.po kde-i18n-fr-3.5.10/messages/kdebase/krandr.po +--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/krandr.po 2008-08-19 20:29:30.000000000 +0200 ++++ kde-i18n-fr-3.5.10/messages/kdebase/krandr.po 2011-11-01 17:42:36.100570353 +0100 +@@ -301,3 +301,33 @@ + "_: Refresh rate in Hertz (Hz)\n" + "%1 Hz" + msgstr "%1 Hz" ++ ++### TDE 3.5.13 ### ++ ++#: krandrtray.cpp:237 ++msgid "Global Configuation" ++msgstr "Configuration Globale" ++ ++#: krandrtray.cpp:239 ++msgid "Configure Color Profiles..." ++msgstr "Configurer les profils de couleurs ..." ++ ++#: krandrtray.cpp:249 ++msgid "Configure Shortcut Keys..." ++msgstr "Configurer les raccourcis clavier..." ++ ++#: krandrtray.cpp:477 ++msgid "Configure Display Color Profiles" ++msgstr "Configuration des profils de couleurs" ++ ++#: krandrbindings.cpp:29 ++msgid "Display Control" ++msgstr "Paramètres d'affichage" ++ ++#: krandrbindings.cpp:31 ++msgid "Switch Displays" ++msgstr "Permuter l'affichage" ++ ++#: configdialog.cpp:49 ++msgid "Global &Shortcuts" ++msgstr "Raccourcis Globaux" +diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksmserver.po kde-i18n-fr-3.5.10/messages/kdebase/ksmserver.po +--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksmserver.po 2007-05-14 10:07:36.000000000 +0200 ++++ kde-i18n-fr-3.5.10/messages/kdebase/ksmserver.po 2011-11-01 17:29:02.909615530 +0100 +@@ -92,3 +92,14 @@ + "_: current option in boot loader\n" + " (current)" + msgstr " (courant)" ++ ++### TDE 3.5.13 ### ++ ++#: shutdown.cpp:202 ++msgid "Synchronizing remote folders" ++msgstr "Synchronisation des dossiers distants" ++ ++#: shutdown.cpp:207 ++msgid "Saving your settings..." ++msgstr "Enregistrement de vos paramètres ..." ++ +diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksplash.po kde-i18n-fr-3.5.10/messages/kdebase/ksplash.po +--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksplash.po 2005-09-10 13:02:44.000000000 +0200 ++++ kde-i18n-fr-3.5.10/messages/kdebase/ksplash.po 2011-11-01 17:03:49.799926756 +0100 +@@ -105,5 +105,5 @@ + msgstr "Rétablissement de la session" + + #: themeengine/objkstheme.cpp:135 +-msgid "KDE is up and running" +-msgstr "KDE est prêt" ++msgid "Trinity is up and running" ++msgstr "Trinity est prêt" +diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/Makefile.in kde-i18n-fr-3.5.10/messages/kdebase/Makefile.in +--- kde-i18n-fr-3.5.10.ORI/messages/kdebase/Makefile.in 2008-08-20 09:14:47.000000000 +0200 ++++ kde-i18n-fr-3.5.10/messages/kdebase/Makefile.in 2011-11-01 16:32:57.157386765 +0100 +@@ -192,8 +192,8 @@ + SUBDIRS =. + #>- POFILES = AUTO + #>+ 2 +-POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmkwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po kdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po kdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po kwin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmkwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_kdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po kwin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po kwin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po kdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po kdeprint_part.po kio_smtp.po +-GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo ++POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmkwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po kdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po kdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po kwin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmkwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_kdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po kwin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po kwin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po kdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po kdeprint_part.po kio_smtp.po kcmiccconfig.po ++GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo kcmiccconfig.gmo + #>- all: all-recursive + #>+ 1 + all: all-nls docs-am all-recursive +@@ -531,7 +531,7 @@ + .NOEXPORT: + + #>+ 2 +-KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po kwin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po kdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmkwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po kwin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in kdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_kdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po kwin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmkwinrules.po libdmctl.po krdb.po kio_home.po kdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po kdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po ++KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po kwin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po kdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmkwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po kwin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in kdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_kdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po kwin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmkwinrules.po libdmctl.po krdb.po kio_home.po kdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po kdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po kcmiccconfig.po + + #>+ 469 + kio_sftp.gmo: kio_sftp.po +@@ -1002,15 +1002,18 @@ + kio_smtp.gmo: kio_smtp.po + rm -f kio_smtp.gmo; $(GMSGFMT) -o kio_smtp.gmo $(srcdir)/kio_smtp.po + test ! -f kio_smtp.gmo || touch kio_smtp.gmo ++kcmiccconfig.gmo: kcmiccconfig.po ++ rm -f kcmiccconfig.gmo; $(GMSGFMT) -o kcmiccconfig.gmo $(srcdir)/kcmiccconfig.po ++ test ! -f kcmiccconfig.gmo || touch kcmiccconfig.gmo + + #>+ 3 + clean-nls: +- -rm -f kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo ++ -rm -f kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo kcmiccconfig.gmo + + #>+ 10 + install-nls: + $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES +- @for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmkwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home kdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 kdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager kwin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmkwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_kdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard kwin libkicker khelpcenter ksmserver kgreet_winbind drkonqi kwin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror kdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba kdeprint_part kio_smtp ; do \ ++ @for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmkwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home kdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 kdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager kwin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmkwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_kdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard kwin libkicker khelpcenter ksmserver kgreet_winbind drkonqi kwin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror kdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba kdeprint_part kio_smtp kcmiccconfig ; do \ + echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\ + if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\ + elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\ +@@ -1176,6 +1179,7 @@ + rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmsamba.mo + rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdeprint_part.mo + rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_smtp.mo ++ rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmiccconfig.mo + + #>+ 2 + all-nls: $(GMOFILES) +diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po kde-i18n-fr-3.5.10/messages/kdelibs/kdelibs.po +--- kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po 2008-08-19 20:29:58.000000000 +0200 ++++ kde-i18n-fr-3.5.10/messages/kdelibs/kdelibs.po 2011-11-01 17:02:35.529386462 +0100 +@@ -5557,123 +5557,104 @@ + + #: kdeui/kaboutkde.cpp:34 + msgid "" +-"The K Desktop Environment is written and maintained by the KDE Team, a " +-"world-wide network of software engineers committed to Trinity Desktop Environment is a fork of the " ++"K Desktop Environment version 3.5, which was originally written by the KDE Team, " ++"a world-wide network of software engineers committed to Free Software " +-"development." +-"
" +-"
No single group, company or organization controls the KDE source code. " +-"Everyone is welcome to contribute to KDE." +-"
" +-"
Visit http://www.kde.org " ++"development.

No single group, company or organization controls the " ++"Trinity source code. Everyone is welcome to contribute to Trinity.

Visit http://www.trinitydesktop.org for more information " ++"about Trinity, and http://www.kde.org " + "for more information on the KDE project. " + msgstr "" +-"L'Environnement Bureautique KDE est écrit et maintenu par l'équipe de " +-"KDE, des informaticiens du monde entier travaillant sur Internet au " +-"développement de " +-"logiciels libres." +-"
" +-"
Aucune société ni organisation ne contrôle le code source de KDE, et chacun " +-"est invité à y contribuer." +-"
" +-"
Visitez http://www.kde.org/fr " ++"L'Environnement Bureautique Trinity est un clone de l'environnement " ++"KDE version 3.5, originellement écrit par l'équipe KDE, des informaticiens " ++"du monde entier travaillant sur Internet au développement de logiciels libres." ++"

Aucune société ni organisation ne contrôle le code source de Trinity, et chacun " ++"est invité à y contribuer.

Visitez " ++"http://www.trinitydesktop.org pour plus d'informations sur Trinity, et http://www.kde.org/fr " + "pour plus d'informations sur le projet KDE." + + #: kdeui/kaboutkde.cpp:43 + msgid "" +-"Software can always be improved, and the KDE Team is ready to do so. However, " +-"you - the user - must tell us when something does not work as expected or could " +-"be done better." +-"
" +-"
The K Desktop Environment has a bug tracking system. Visit http://bugs.kde.org " +-"or use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs." +-"
" +-"
If you have a suggestion for improvement then you are welcome to use the " +-"bug tracking system to register your wish. Make sure you use the severity " +-"called \"Wishlist\"." ++"Software can always be improved, and the Trinity Team is ready to " ++"do so. However, you - the user - must tell us when " ++"something does not work as expected or could be done better.

" ++"The Trinity Desktop Environment has a bug tracking system. Visit " ++"http://bugs.pearsoncomputing.net or " ++"use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.

" ++"If you have a suggestion for improvement then you are welcome to use " ++"the bug tracking system to register your wish. Make sure you use the " ++"severity called \"Wishlist\"." + msgstr "" +-"Les logiciels peuvent toujours être améliorés et l'équipe KDE est prête à le " ++"Les logiciels peuvent toujours être améliorés et l'équipe Trinity est prête à le " + "faire. Cependant, vous - l'utilisateur(trice) - devez nous signaler ce qui ne " +-"fonctionne pas correctement ou pourrait être perfectionné." +-"
" +-"
L'Environnement de Bureau KDE possède un système de suivi des bogues. Allez " +-"sur http://bugs.kde.org/ " +-"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour " +-"signaler les erreurs." +-"
" +-"
Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le " ++"fonctionne pas correctement ou pourrait être perfectionné.

" ++"L'Environnement de Bureau Trinity possède un système de suivi des bogues. Allez " ++"sur http://bugs.pearsoncomputing.net " ++"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour signaler les " ++"erreurs.

Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le " + "système de suivi des bogues pour enregistrer votre souhait. Assurez-vous " + "d'avoir utilisé l'option « Souhait » (wish)." + + #: kdeui/kaboutkde.cpp:54 + msgid "" +-"You do not have to be a software developer to be a member of the KDE team. You " +-"can join the national teams that translate program interfaces. You can provide " +-"graphics, themes, sounds, and improved documentation. You decide!" +-"
" +-"
Visit http://www.kde.org/jobs/ " ++"You do not have to be a software developer to be a member of the " ++"Trinity team. You can join the national teams that translate " ++"program interfaces. You can provide graphics, themes, sounds, and " ++"improved documentation. You decide!" ++"

" ++"Visit " ++"http://www.trinitydesktop.org/jobs/ " + "for information on some projects in which you can participate." +-"
" +-"
If you need more information or documentation, then a visit to http://developer.kde.org " ++"

" ++"If you need more information or documentation, then a visit to " ++"http://www.trinitydesktop.org/docs/ " + "will provide you with what you need." + msgstr "" +-"Il n'est pas nécessaire d'être programmeur pour être membre de l'équipe de KDE. " ++"Il n'est pas nécessaire d'être programmeur pour être membre de l'équipe de Trinity. " + "Vous pouvez rejoindre les équipes nationales qui traduisent les interfaces des " + "programmes. Vous pouvez réaliser des images, des thèmes, des sons et des " + "documentations enrichies. C'est vous qui décidez !" +-"
" +-"
Visitez " +-"http://www.kde.org/fr/jobs.html pour des informations sur certains projets " +-"auxquels vous pouvez participer." +-"
" +-"
Pour plus d'informations ou de documentations, une visite de http://developer.kde.org/ " ++"

" ++"Visitez " ++"http://www.trinitydesktop.org/jobs/" ++"pour des informations sur certains projets auxquels vous pouvez participer." ++"

" ++"Pour plus d'informations ou de documentations, une visite de http://www.trinitydesktop.org/docs/ " + "devrait vous fournir ce dont vous avez besoin." + + #: kdeui/kaboutkde.cpp:67 + msgid "" +-"KDE is available free of charge, but making it is not free." +-"
" +-"
Thus, the KDE team formed the KDE e.V., a non-profit organization legally " +-"founded in Tuebingen, Germany. The KDE e.V. represents the KDE project in legal " +-"and financial matters. See " +-"http://www.kde-ev.org for information on the KDE e.V." +-"
" +-"
The KDE team does need financial support. Most of the money is used to " +-"reimburse members and others on expenses they experienced when contributing to " +-"KDE. You are encouraged to support KDE through a financial donation, using one " +-"of the ways described at " +-"http://www.kde.org/support/." +-"
" +-"
Thank you very much in advance for your support." +-msgstr "" +-"KDE est disponible gratuitement, mais sa réalisation a un coût." +-"
" +-"
C'est pourquoi l'équipe de KDE a formé l'association KDE, une association à " +-"but non lucratif fondée à Tübingen (Allemagne). L'association KDE représente " +-"les aspects juridiques et financiers du Projet KDE. Consultez http://www.kde-ev.org/ " +-"pour plus d'informations sur l'association KDE." +-"
" +-"
L'équipe de KDE a besoin d'un appui financier. La majeure partie de ses " ++"Trinity is available free of charge, but making it is not free.

" ++"

" ++"The Trinity team does need financial support. Most of the money is used to " ++"reimburse members and others on expenses they experienced when " ++"contributing to Trinity. You are encouraged to support Trinity through a financial " ++"donation, using one of the ways described at " ++"http://www.trinitydesktop.org/donate.php." ++"

Thank you very much in advance for your support!" ++msgstr "" ++"Trinity est disponible gratuitement, mais sa réalisation a un coût." ++"

" ++"
L'équipe de Trinity a besoin d'un appui financier. La majeure partie de ses " + "fonds sert à rembourser les membres et d'autres intervenants des dépenses " +-"qu'ils ont engagées lors de leur contribution à KDE. Pour apporter votre " +-"participation financière à KDE, utilisez l'une des possibilités décrites à " +-"l'adresse http://www.kde.org/support/." +-"
" +-"
Nous vous remercions vivement de votre soutien." ++"qu'ils ont engagées lors de leur contribution à Trinity. Pour apporter votre " ++"participation financière à Trinity, utilisez l'une des possibilités décrites à " ++"l'adresse http://www.trinitydesktop.org/donate.php." ++"

Nous vous remercions vivement de votre soutien." + + #: kdeui/kaboutkde.cpp:81 + #, c-format +-msgid "K Desktop Environment. Release %1" +-msgstr "Environnement de bureau KDE. Version %1" ++msgid "Trinity Desktop Environment. Release %1" ++msgstr "Environnement de bureau Trinity. Version %1" + + #: kdeui/kaboutkde.cpp:83 + msgid "" +-"_: About KDE\n" ++"About Trinity" + "&About" + msgstr "À &propos" + +@@ -5682,12 +5663,12 @@ + msgstr "Rapport de bogues et &souhaits" + + #: kdeui/kaboutkde.cpp:85 +-msgid "&Join the KDE Team" +-msgstr "Re&joignez l'équipe de KDE" ++msgid "&Join the Trinity Team" ++msgstr "Re&joignez l'équipe de Trinity" + + #: kdeui/kaboutkde.cpp:86 +-msgid "&Support KDE" +-msgstr "&Soutenez KDE" ++msgid "&Support Trinity" ++msgstr "&Soutenez Trinity" + + #: kdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804 + msgid "&Yes" +@@ -6623,8 +6604,8 @@ + msgstr "À &propos de : %1" + + #: kdeui/khelpmenu.cpp:176 kdeui/kstdaction_p.h:114 +-msgid "About &KDE" +-msgstr "À propos de &KDE" ++msgid "About &Trinity" ++msgstr "À propos de &Trinity" + + #: kdeui/kactionclasses.cpp:2072 + msgid "Exit F&ull Screen Mode" diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec index 3783612a7..16484c0ed 100644 --- a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec +++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -10,7 +10,7 @@ %define _docdir %{_prefix}/share/doc %endif -# TDE 3.5.12 specific building variables +# TDE 3.5.13 specific building variables BuildRequires: autoconf automake libtool m4 %define tde_docdir %{_docdir}/kde %define tde_includedir %{_includedir}/kde @@ -46,12 +46,15 @@ AutoReq: no Source0: kde-i18n-%{version}.tar.gz -# Patch for 'kdesu': the message was modified in 'kdebase' package +# TDE 3.5.12: Translate 'kdesu' message was modified in 'kdebase' package Patch0: kde-i18n-kdesu.patch -# Patch to translate 'Open Terminal Here' desktop shortcut +# TDE 3.5.12: Translate 'Open Terminal Here' desktop shortcut Patch1: trinity-kde-i18n-fr-openterminalhere.patch +# TDE 3.5.13: French translations for new features +Patch2: kde-i18n-3.5.13-add_french_translations.patch + BuildRequires: findutils BuildRequires: gettext BuildRequires: trinity-arts-devel @@ -625,6 +628,7 @@ done %patch0 %patch1 +%patch2 %build @@ -651,7 +655,7 @@ for l in %{KDE_LANGS}; do if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then pushd ${f} - # Thales: dirty hack to remove directory 'common' from install list (else it fails to install) + # RHEL/Fedora: dirty hack to remove directory 'common' from install list (else it fails to install) if [ -r docs/Makefile ]; then sed -i docs/Makefile -e "s,^\(SUBDIRS =.*\)common\(.*\)$,\1 \2," fi @@ -1224,6 +1228,9 @@ rm -rf %{buildroot} %endif %changelog +* Tue Nov 01 2011 Francois Andriot - 3.5.13-2 +- Add missing french translations for TDE 3.5.13 + * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 From a8666cac95adf2d6155856d9a7abeab2afdc2602 Mon Sep 17 00:00:00 2001 From: albator Date: Wed, 2 Nov 2011 20:52:44 +0100 Subject: [PATCH 23/26] Fedora/RHEL TDE 3.5.13: - Updates gwenview - Add kbookreader, kdbusnotification, kstreamripper --- .../gwenview/trinity-gwenview-3.5.13.spec | 6 +- .../trinity-kbookreader-3.5.13.spec | 128 ++++++++++++++++++ ...otification-3.5.13-ftbfs_qt_ldlflags.patch | 10 ++ .../trinity-kdbusnotification-3.5.13.spec | 126 +++++++++++++++++ ...eamripper-3.5.13-missing_include_tqt.patch | 10 ++ .../trinity-kstreamripper-3.5.13.spec | 118 ++++++++++++++++ redhat/components.txt | 6 +- 7 files changed, 400 insertions(+), 4 deletions(-) create mode 100644 redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec create mode 100644 redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch create mode 100644 redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec create mode 100644 redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch create mode 100644 redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec diff --git a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec index e709120d5..a1323c5c2 100644 --- a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec +++ b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec @@ -9,11 +9,11 @@ %define _docdir %{_prefix}/share/doc %endif -# TDE 3.5.12 specific building variables +# TDE 3.5.13 specific building variables BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir} +%define tde_docdir %{_docdir}/kde %define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/kde3 +%define tde_libdir %{_libdir}/trinity Name: trinity-%{kdecomp} diff --git a/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec new file mode 100644 index 000000000..1157fc5ff --- /dev/null +++ b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec @@ -0,0 +1,128 @@ +# Default version for this component +%define kdecomp kbookreader +%define version 0.2.0 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: eBook reader for Trinity. +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + + +%description +kbookreader is an application which allows you to view eBooks +within the Trinity Desktop Environment. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + + +## File lists +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + fi +done +fi + + +%clean +%__rm -rf %{buildroot} + + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_datadir}/applnk/*/*.desktop +%{_datadir}/apps/*/ +%{_datadir}/config.kcfg/* +%{_docdir}/HTML/en/*/ +%{_datadir}/icons/*/*/*/* + + + +%Changelog +* Sun Oct 30 2011 Francois Andriot - 0.2.0-1 +- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch new file mode 100644 index 000000000..06e1d455e --- /dev/null +++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch @@ -0,0 +1,10 @@ +--- kdbusnotification/src/daemon/Makefile.am.ORI 2011-11-01 22:59:28.000000000 +0100 ++++ kdbusnotification/src/daemon/Makefile.am 2011-11-01 22:59:45.000000000 +0100 +@@ -35,6 +35,7 @@ + $(KDE_RPATH) \ + $(KDE_LDFLAGS) \ + $(LIB_QT) \ ++ $(QT_LDFLAGS) \ + -lDCOP \ + $(LIB_KDECORE) \ + $(LIB_KDEUI) \ diff --git a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec new file mode 100644 index 000000000..27d2f55e5 --- /dev/null +++ b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec @@ -0,0 +1,126 @@ +# Default version for this component +%define kdecomp kdbusnotification +%define version 0.1 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: a DBUS notification service [Trinity] + +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +# [kdbusnotification/src/daemon] Missing QT LDFLAGS +Patch0: kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: dbus-glib-devel +BuildRequires: gtk2-devel + +%description +kdbusnotification is a small program for Trinity that displays +DBUS notifications via unobtrusive, easily dismissed passive popups. + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -p1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + + +## File lists +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + fi +done +fi + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%files +%defattr(-,root,root,-) +%{_bindir}/notification-daemon-tde +%{_datadir}/autostart/kdbusnotification-autostart.desktop + + + +%Changelog +* Sun Oct 30 2011 Francois Andriot - 0.1-1 +- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch new file mode 100644 index 000000000..5663b1a81 --- /dev/null +++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch @@ -0,0 +1,10 @@ +--- kstreamripper/src/addnewstreamimpl.h.ORI 2011-11-02 20:40:17.450317896 +0100 ++++ kstreamripper/src/addnewstreamimpl.h 2011-11-02 20:40:25.777317020 +0100 +@@ -22,6 +22,7 @@ + #define ADDNEWSTREAMIMPL_H + + #include "addnewstream.h" ++#include + + class AddNewStreamImpl : public AddNewStream + { diff --git a/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec new file mode 100644 index 000000000..94855fdcf --- /dev/null +++ b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec @@ -0,0 +1,118 @@ +# Default version for this component +%define kdecomp kstreamripper +%define version 0.3.4 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: TDE frontend for streamripper + +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +Patch0: kstreamripper-3.5.13-missing_include_tqt.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: scons + + +%description +KStreamRipper is a small frontend for the streamripper command +line utility. Streamripper captures internet shoutcast radio streams +on your harddisk and splits them up in mp3 files. KStreamRipper helps +you with managing/ripping your preferred streams. + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -p1 + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +export CXXFLAGS="-I%{_includedir}/tqt" + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + + +## File lists +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + fi +done +fi + + +%clean +%__rm -rf %{buildroot} + + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%files +%defattr(-,root,root,-) +%{_bindir}/kstreamripper +%{_datadir}/applnk/Utilities/kstreamripper.desktop +%{_datadir}/apps/kstreamripper/kstreamripperui.rc +%{tde_docdir}/HTML/en/en/index.cache.bz2 + + + +%Changelog +* Wed Nov 02 2011 Francois Andriot - 0.3.4-1 +- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/components.txt b/redhat/components.txt index ee194d47e..47ea807b7 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -36,5 +36,9 @@ applications/filelight applications/kdiff3 #applications/kuickshow #applications/basket -#applications/katapult +applications/katapult #compizconfig-backend-kconfig +applications/kbookreader +applications/kdbusnotification +applications/kmymoney2 +applications/kstreamripper From 5bfbbfbf28bf7633c91a5ef4882150961c8ed71b Mon Sep 17 00:00:00 2001 From: albator Date: Wed, 2 Nov 2011 20:53:50 +0100 Subject: [PATCH 24/26] Fedora/RHEL: updates TDE 3.5.13 'startkde' script --- .../kdebase/kdebase-3.5.13-startkde_ldpreload.patch | 13 +++++++++++++ redhat/kdebase/trinity-kdebase-3.5.13.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 redhat/kdebase/kdebase-3.5.13-startkde_ldpreload.patch diff --git a/redhat/kdebase/kdebase-3.5.13-startkde_ldpreload.patch b/redhat/kdebase/kdebase-3.5.13-startkde_ldpreload.patch new file mode 100644 index 000000000..1b39a59ff --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.13-startkde_ldpreload.patch @@ -0,0 +1,13 @@ +--- kdebase/startkde.ORI 2011-11-01 22:17:52.000000000 +0100 ++++ kdebase/startkde 2011-11-01 22:18:14.000000000 +0100 +@@ -413,7 +413,9 @@ + fi + + if [ -n $KGTK_PRELOAD ]; then +- if [ -e /usr/lib/libnspr4.so ]; then ++ if [ -e /usr/lib64/libnspr4.so ]; then ++ KGTK_NSPR_PRELOAD="/usr/lib64/libnspr4.so:" ++ elif [ -e /usr/lib/libnspr4.so ]; then + KGTK_NSPR_PRELOAD="/usr/lib/libnspr4.so:" + fi + export LD_PRELOAD=$KGTK_PRELOAD:$KGTK_NSPR_PRELOAD$LD_PRELOAD diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index 9675530b0..2431e044a 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -57,6 +57,8 @@ Patch5: kdebase-3.5.12-desktop-openterminalhere.patch Patch6: kdebase-3.5.12-halmountoptions.patch # [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession' Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch +# [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64 +Patch8: kdebase-3.5.13-startkde_ldpreload.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel @@ -171,6 +173,7 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build @@ -510,6 +513,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/cmake/*.cmake %changelog +* Tue Nov 01 2011 Francois Andriot - 3.5.13-2 +- Add 'patch8' to fix LD_PRELOAD variable set by 'startkde' under x86_64 + * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 From fcebb4031d6bba0fbd0423b3829840912c978235 Mon Sep 17 00:00:00 2001 From: albator Date: Wed, 2 Nov 2011 22:50:04 +0100 Subject: [PATCH 25/26] RHEL/Fedora: add kdesudo --- .../kdesudo/trinity-kdesudo-3.5.13.spec | 124 ++++++++++++++++++ redhat/components.txt | 1 + 2 files changed, 125 insertions(+) create mode 100644 redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec diff --git a/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec new file mode 100644 index 000000000..28425aac5 --- /dev/null +++ b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec @@ -0,0 +1,124 @@ +# Default version for this component +%define kdecomp kdesudo +%define version 2.5.1 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: sudo frontend for Trinity + +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + + +%description +KdeSudo is a graphical frontend for the sudo utility. +It allows you to run programs as another user by entering your password. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common + +%build +unset QTDIR || : ; source /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + + +## File lists +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + fi +done +fi + + +%clean +%__rm -rf %{buildroot} + + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%files +%defattr(-,root,root,-) +%{_bindir}/kdesudo +%{_docdir}/HTML/en/kdesudo/common +%{_docdir}/HTML/en/kdesudo/index.cache.bz2 +%{_docdir}/HTML/en/kdesudo/index.docbook +%{_datadir}/locale/fr/LC_MESSAGES/kdesudo.mo + + +%Changelog +* Wed Nov 02 2011 Francois Andriot - 2.5.1-1 +- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/components.txt b/redhat/components.txt index 47ea807b7..d27ab75e1 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -42,3 +42,4 @@ applications/kbookreader applications/kdbusnotification applications/kmymoney2 applications/kstreamripper +applications/kdesudo From 43240f192dbdd0c0d267bc7c4a96f123704f0e2b Mon Sep 17 00:00:00 2001 From: albator Date: Wed, 2 Nov 2011 22:50:25 +0100 Subject: [PATCH 26/26] RHEL5: corrects kpovmodeler compilation --- ....5.13-kpovmodeler_missing_gl_ldflags.patch | 10 +++++++ .../trinity-kdegraphics-3.5.13.spec | 27 +++++-------------- 2 files changed, 17 insertions(+), 20 deletions(-) create mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch b/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch new file mode 100644 index 000000000..84b7b6e4a --- /dev/null +++ b/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch @@ -0,0 +1,10 @@ +--- kdegraphics/kpovmodeler/ConfigureChecks.cmake.ORI 2011-11-02 21:57:05.000000000 +0100 ++++ kdegraphics/kpovmodeler/ConfigureChecks.cmake 2011-11-02 21:57:49.000000000 +0100 +@@ -16,6 +16,7 @@ + if( NOT HAVE_GLU ) + tde_message_fatal( "glu is required, but was not found on your system" ) + endif ( ) ++ set( GLU_LIBRARIES "-lGL -lGLU" ) + endif( ) + + diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec index 2133f4ddf..fcb49e865 100644 --- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec +++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -16,12 +16,6 @@ BuildRequires: cmake >= 2.8 %define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity -# KDEGRAPHICS specific options -%if 0%{?rhel} && 0%{?rhel} <= 5 -%define build_kpovmodeler 0 -%else -%define build_kpovmodeler 1 -%endif Name: trinity-kdegraphics Version: %{?version} @@ -50,6 +44,8 @@ Patch1: kdegraphics-3.5.13-kpovmodeler_check_glu.patch Patch2: kdegraphics-3.5.13-disable_poppler.patch ### [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5 Patch3: kdegraphics-3.5.13-xpdf_disable_mkstemps.patch +### [kdegraphics/kpovmodeler] CMAKE missing GLU_LIBRARIES +Patch4: kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -87,9 +83,7 @@ BuildRequires: libart_lgpl-devel BuildRequires: libXmu-devel # kpovmodeler -%if 0%{?build_kpovmodeler} BuildRequires: libGL-devel libGLU-devel libXi-devel -%endif Requires: tqtinterface Requires: trinity-arts @@ -135,9 +129,7 @@ Requires(postun): /sbin/ldconfig %{summary}, including: * kfax * kfaxview -%if 0%{?build_kpovmodeler} * kpovmodler -%endif %package libs Summary: %{name} runtime libraries @@ -158,6 +150,7 @@ Requires: %{name} = %{version}-%{release} %if 0%{?rhel} && 0%{?rhel} <= 5 %patch3 -p1 %endif +%patch4 -p1 %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -179,9 +172,6 @@ cd build -DWITH_PDF=ON \ %endif -DBUILD_ALL=ON \ -%if 0%{?build_kpovmodeler} == 0 - -DBUILD_KPOVMODELER=OFF \ -%endif .. %__make %{?_smp_mflags} @@ -287,7 +277,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/services/kfaxmultipage_tiff.desktop # kpovmodeler -%if 0%{?build_kpovmodeler} %doc rpmdocs/kpovmodeler/ %doc %{tde_docdir}/HTML/en/kpovmodeler/ %{_bindir}/kpovmodeler @@ -298,7 +287,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/apps/kpovmodeler/ %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* %{_datadir}/icons/hicolor/*/apps/kpovmodeler.* -%endif %files -f %{name}.lang %defattr(-,root,root,-) @@ -323,7 +311,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/services/kfaxmultipage_tiff.desktop # kpovmodeler -%if 0%{?build_kpovmodeler} %exclude %{tde_docdir}/HTML/en/kpovmodeler/ %exclude %{_bindir}/kpovmodeler %exclude %{_libdir}/libkpovmodeler.* @@ -332,7 +319,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/apps/kpovmodeler/ %exclude %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* %exclude %{_datadir}/icons/hicolor/*/apps/kpovmodeler.* -%endif %{_bindir}/* %{_datadir}/applications/kde/*.desktop @@ -350,10 +336,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files libs %defattr(-,root,root,-) %exclude %{_libdir}/libkfaximage.la -%if 0%{?build_kpovmodeler} %exclude %{_libdir}/libkpovmodeler.la %exclude %{_libdir}/libkpovmodeler.so.* -%endif %{_libdir}/lib*.so.* %{_libdir}/lib*.la # Why ??? @@ -377,6 +361,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libdjvu.so %changelog +* Wed Nov 02 2011 Francois Andriot - 3.5.13-2 +- Fix kpovmodeler compilation on RHEL 5 (patch4) + * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 - RHEL 5 build has some features disabled (see patches)