From 481b46fdd0e36396cbbf2308dfce83df10b979df Mon Sep 17 00:00:00 2001 From: Robert Xu Date: Sun, 26 Feb 2012 12:50:04 -0500 Subject: Push working tdelibs (rpmlint errors don't count) --- opensuse/core/tdelibs/tdelibs.spec | 456 +++++++++++-------------------------- 1 file changed, 136 insertions(+), 320 deletions(-) (limited to 'opensuse/core/tdelibs/tdelibs.spec') diff --git a/opensuse/core/tdelibs/tdelibs.spec b/opensuse/core/tdelibs/tdelibs.spec index 2576ad4d8..314ae8d5d 100644 --- a/opensuse/core/tdelibs/tdelibs.spec +++ b/opensuse/core/tdelibs/tdelibs.spec @@ -19,7 +19,7 @@ Name: tdelibs -BuildRequires: OpenEXR-devel arts-devel aspell-devel cups-devel fam-devel flac-devel krb5-devel +BuildRequires: OpenEXR-devel arts arts-devel aspell-devel cups-devel fam-devel flac-devel krb5-devel BuildRequires: libart_lgpl-devel libidn-devel libsndfile libtiff-devel BuildRequires: libxslt-devel openldap2-devel pcre-devel libtqt4-devel sgml-skel BuildRequires: db-devel libacl-devel libattr-devel unsermake update-desktop-files utempter @@ -31,7 +31,7 @@ License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ Group: System/GUI/TDE BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Trinity Base Libraries -Version: 3.5.12.99 +Version: R13.99 Release: 1 Provides: kups keramik tdelibs-cups tdelibs-33addons tdepim-networkstatus Provides: kdelibs3_base = 3.3 @@ -40,8 +40,7 @@ Requires: openssl tdelibs-default-style Requires: hicolor-icon-theme Recommends: ispell enscript Requires: sudo -Requires: libtqt4 -Source0: kdelibs-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 Source3: baselibs.conf Source4: api_docu_description Source6: tderc @@ -54,99 +53,6 @@ Source12: mimetype-icons.tar.bz2 Source14: vnd.openxmlformats-officedocument.wordprocessingml.document.desktop Source15: vnd.openxmlformats-officedocument.presentationml.presentation.desktop Source16: vnd.openxmlformats-officedocument.spreadsheetml.sheet.desktop -Patch0: 3_5_BRANCH.diff -Patch1: kdeversion.diff -Patch2: admin.diff -Patch3: show-distribution.diff -Patch5: applications.menu-fallback.diff -Patch7: stat-on-media.diff -Patch8: kmimelist.diff -Patch9: x-kde-InitialPreference.diff -Patch10: disable-idn-support.diff -Patch11: silence.diff -Patch12: smooth-scrolling.diff -Patch13: rubberband-selection.diff -Patch15: add-suse-translations.diff -Patch16: kde3rc.dif -Patch17: artwork.diff -Patch26: mimetype-changes.diff -Patch27: noauto-package.diff -Patch29: prefer_distribution_settings.dif -Patch34: allow-man-setgid.diff -Patch40: clever-menu.diff -Patch43: fileshare.diff -Patch44: fontconfig-reverse-lookup.diff -Patch45: limit-max-image-size.diff -Patch50: fix-gnome-help-support.diff -Patch950: fix-gnome-help-support_legacy.diff -Patch52: kdeprint-restart-cupsd.diff -Patch54: kdemm.diff -Patch55: fix-kdemm-build.diff -Patch56: fix-dcopidlng-within-kdelibs-build.diff -Patch57: kdemm-filepreview.diff -Patch60: fix-qxembed.diff -Patch65: integrate-global-pixmaps-new.diff -Patch66: integrate-global-pixmaps-10.1.diff -Patch70: ktip-icon-hack.diff -Patch80: CATALOG.kdelibs3.diff -Patch81: xml-catalog.diff -Patch83: kdelibs3-gcc-4.1-miscompile.diff -Patch85: desktop-translations.diff -Patch86: use-xauthlocalhostname.diff -Patch88: mozilla-sliders.patch -Patch89: kdeprint-utf8.diff -Patch90: kimproxy-warning.diff -Patch95: kdelibs_networkstatus_branch2.diff -Patch97: autostart-spec.diff -Patch105: kdelibs3-hicolor-scalable-sizes.patch -Patch106: use-mediamanager.diff -Patch108: patch-mimetype-iconnames.diff -Patch109: fix-kerberos-printing.diff -Patch110: printpreview.patch -Patch111: kfile-beagle.diff -Patch112: xinerama.patch -Patch113: kremoteencoding-utf8.diff -Patch114: no-progress-for-beagle-status-query.diff -Patch117: kickoff-drop-shadow.diff -Patch122: disable-samba-dialog-without-smb.diff -Patch123: lpoptions-cups-1.2.diff -Patch124: spellcheck-default-utf8.diff -Patch125: kde4-applications.diff -Patch126: avahi-pidfile.diff -Patch127: x-jar-desktop.diff -Patch128: google-mail.diff -Patch129: default-useragent.diff -Patch130: kwalletd-try-open.diff -Patch131: textcompletion-editor.diff -Patch132: no-debug-by-default.diff -Patch133: flash-player-non-oss.diff -Patch134: bundle-locale-help.diff -Patch149: networkstatus.diff -Patch150: kdesu-settings.diff -Patch152: bug-399296_ftphandling-fix.diff -Patch153: bug-382959_kabc_fix_vcardparser.patch -Patch154: r874968-ebay-crash.diff -Patch155: gcc44.diff -Patch156: fix-macmenu.patch -Patch157: ignore-inline-menu.diff -Patch158: bnc557126.diff -Patch159: xmlhttprequest_3.x.diff -Patch160: kdecode_fakes_include.diff -Patch161: gcc45.diff -Patch162: arts-acinclude.patch -Patch163: kdelibs-3.5.10-ossl-1.x.patch -Patch164: light_v_2_scrollbar_patch.patch - -Patch201: kdelibs-3.5.4-CVE-2009-1690.patch -Patch203: kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch -Patch204: kdelibs-3.5.10-CVE-2009-2702.patch -Patch205: kdelibs-3.5.10-cve-2009-2537-select-length.patch -Patch206: kdelibs-3.5.10-cve-2009-1725.patch -Patch207: kdelibs-3.5.10-cve-2009-1698.patch - -Patch210: kdelibs-3.5.10-kio.patch -Patch211: oom_score_adj.patch -Patch212: kcontrol_crash_patch.diff %description This package contains tdelibs, one of the basic packages of the Trinity @@ -171,7 +77,7 @@ daemon. License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ Summary: The default TDE style Group: System/GUI/TDE -Provides: tdelibs:/opt/tde/%_lib/libkdefx.so.4 +Provides: tdelibs:%{_tde_libdir}/libtdefx.so.4 %description default-style This package contains the Plastik widget style and libkdefx. It only @@ -211,125 +117,10 @@ to develop applications that require these. %prep echo %suse_version -%setup -q -n kdelibs-%{version} -%patch0 -%patch1 -%patch3 -%patch5 -%patch7 -%patch10 -%patch11 -%patch12 -%patch13 -%patch15 -%patch16 -%patch17 -%patch26 -%patch27 -%patch29 -#%patch43 -#disable it because of BIC -#%patch45 -%if %suse_version > 1020 -%patch50 -%else -%patch950 -%endif -%patch52 -%patch34 -%patch44 -%patch40 -%patch8 -%patch9 +%setup -q tar xfvj %SOURCE10 -# TODO! -%patch54 -%patch55 -%patch56 -%patch57 -%patch60 -# 10.2 goes back to the version without suseadds -%if %suse_version > 1010 -%patch65 -%else -%if %suse_version > 1000 -%patch66 -%else -%patch65 -%endif -%endif -%patch70 rm -rf admin bunzip2 -cd %{SOURCE8} | tar xfv - --exclude=.cvsignore --exclude=CVS -install -m 755 %{SOURCE2} admin -%patch2 -%patch80 -p 1 -%patch81 -%if %suse_version > 1000 -%patch83 -%endif -%patch85 -%patch86 -%patch88 -%patch89 -%patch90 -%patch95 -%patch97 -%if %suse_version < 1030 -%patch105 -p 1 -%endif -%patch106 -%patch108 -%patch109 -%patch110 -%patch111 -%patch112 -%patch113 -%patch114 -%patch117 -%patch122 -%if %suse_version > 1010 -%patch123 -%endif -%patch124 -%patch125 -%patch126 -%patch127 -%patch128 -%patch129 -%patch130 -%patch131 -%patch132 -%if %suse_version > 1020 -%patch133 -%patch134 -%endif -%patch149 -%patch150 -%patch152 -%patch153 -%patch154 -%patch155 -%patch156 -%if %suse_version > 1110 -%patch157 -%endif -%patch158 -%patch159 -%patch160 -%patch161 -%patch162 -p1 -%patch163 -p1 -%patch164 -p1 -%patch201 -p1 -%patch203 -p1 -%patch204 -p1 -%patch205 -p1 -%patch206 -%patch207 -p1 -%patch210 -p1 -%patch211 -p1 -%patch212 tar xfvj %SOURCE12 # @@ -367,16 +158,15 @@ CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" export PATH=/usr/lib/mit/bin:$PATH # fast-malloc is not needed anymore -%cmake_tde -d build -- \ - -DCMAKE_SKIP_RPATH=OFF \ - -DKDE_MALLOC_FULL=OFF \ - -DKDE_MALLOC=OFF \ - -DKDE_DISTRIBUTION="$DISTRI" \ - -DSSL_INSTALL_DIR=/usr/ssl \ - -DPCSC_INSTALL_DIR=/usr \ - %if %is_plus - -DENABLE_DNOFIFY=ON \ - %endif +EXTRA_FLAGS="-DCMAKE_SKIP_RPATH=OFF -DKDE_MALLOC_FULL=OFF -DKDE_MALLOC=OFF -DSSL_INSTALL_DIR=/usr/ssl -DPCSC_INSTALL_DIR=/usr -DENABLE_DNOFIFY=ON" + +# -DKDE_DISTRIBUTION=\"$DISTRI\" + +# %if %is_plus +# -DENABLE_DNOFIFY=ON \ +# %endif + +%cmake_tde -d build -- $EXTRA_FLAGS %make_tde -d build @@ -482,7 +272,8 @@ sed '/ $RPM_BUILD_ROOT/etc/ld.so.conf.d/tdelibs.conf <