[kdenetwork/f19: 11/13] Revert "use strigi_analyzers macro"

Rex Dieter rdieter at fedoraproject.org
Thu Sep 5 20:35:04 UTC 2013


commit 1ba28354db9c3b24d8aac5a8938035d937b1f82c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 15:34:24 2013 -0500

    Revert "use strigi_analyzers macro"
    
    This reverts commit 2ec7da401a26ab7e5180f83de8e5fce92ea7942a.

 kdenetwork.spec |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/kdenetwork.spec b/kdenetwork.spec
index ed48a5f..046fd1c 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -2,7 +2,6 @@
 %if 0%{?fedora}
 ## disable: kopete can't use google talk http://bugzilla.redhat.com/963310
 #define use_system_iris 1
-%define strigi_analyzers 1
 %endif
 
 #if 0%{?fedora} > 18
@@ -278,7 +277,7 @@ mv kopete/protocols/jabber/libiris \
    kopete/protocols/jabber/libiris.BAK
 %endif
 
-%if ! 0%{?strigi_analyzers}
+%if 0%{?rhel}
 sed -i 's|macro_optional_add_subdirectory( kdenetwork-strigi-analyzers )|#macro_optional_add_subdirectory( kdenetwork-strigi-analyzers )|g' CMakeLists.txt
 %endif
 
@@ -348,7 +347,7 @@ done
 %{_kde4_libdir}/kde4/sambausershareplugin.so
 %{_kde4_datadir}/kde4/services/sambausershareplugin.desktop
 
-%if 0%{?strigi_analyzers}
+%if 0%{?fedora}
 %files strigi-analyzers
 %{_kde4_libdir}/strigi/strigita_torrent_analyzer.so
 %endif


More information about the scm-commits mailing list