rpms/strigi/devel strigi.spec,1.51,1.52

Rex Dieter rdieter at fedoraproject.org
Mon Jul 12 19:49:58 UTC 2010


Author: rdieter

Update of /cvs/pkgs/rpms/strigi/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13872

Modified Files:
	strigi.spec 
Log Message:
* Mon Jul 12 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.2-5
- disable rpmanalyzer support, until crasher(s) fixed (#609541)
- tidy up spec



Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- strigi.spec	30 Jun 2010 13:37:55 -0000	1.51
+++ strigi.spec	12 Jul 2010 19:49:57 -0000	1.52
@@ -1,7 +1,7 @@
 
 Name:		strigi
 Version:	0.7.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A desktop search program
 Group:		Applications/Productivity
 License:	LGPLv2+
@@ -10,19 +10,31 @@ URL:            http://www.vandenoever.i
 Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}%{?pre:-%{pre}}.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
-Patch0:		strigi-0.6.2-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## fedora-only patches
+Patch0: strigi-0.6.2-multilib.patch
+# disable rpm indexing, http://bugzilla.redhat.com/609541
+# until fixed upstream, 
+# https://sourceforge.net/tracker/?func=detail&aid=3016947&group_id=171000&atid=856302
+Patch1: strigi-0.7.2-no_rpm.patch
+
 ## upstream patches
 # http://bugs.kde.org/234398
 Patch100: strigi-0.7.2-kdebug234398.patch
 
-BuildRequires:	cmake >= 2.4.5
-BuildRequires:	clucene-core-devel qt4-devel dbus-devel
-BuildRequires:	libxml2-devel expat-devel bzip2-devel zlib-devel
-BuildRequires:	cppunit-devel exiv2-devel
 BuildRequires:  bison
-BuildRequires:	desktop-file-utils
+BuildRequires:  bzip2-devel
+BuildRequires:	cmake >= 2.4.5
+BuildRequires:	clucene-core-devel
+BuildRequires:  cppunit-devel
+BuildRequires:  dbus-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  exiv2-devel
+BuildRequires:  expat-devel
+BuildRequires:	libxml2-devel
+BuildRequires:  qt4-devel
+BuildRequires:  zlib-devel
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -43,23 +55,23 @@ daemon can.
 Summary:	Development files for the strigi desktop search engine
 Group:		Development/Libraries
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
-Requires:	pkgconfig
-
 %description	devel
 Development files for the strigi desktop search engine
 
 %package	libs
 Summary:	Strigi libraries
 Group:		Development/Libraries
-
 %description	libs
 Strigi search engine libraries
 
+
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 %patch0 -p1 -b .multilib
+%patch1 -p1 -b .no_rpm
 %patch100 -p1 -b .kdebug234398
 
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -71,6 +83,7 @@ popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 rm -rf %{buildroot}
 make install/fast -C %{_target_platform}  DESTDIR=%{buildroot}
@@ -83,16 +96,20 @@ desktop-file-install					\
 # Add an autostart desktop file for the strigi daemon
 install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
 
+
 %check
 make -C %{_target_platform}/tests
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
@@ -119,8 +136,13 @@ rm -rf %{buildroot}
 %dir %{_libdir}/strigi/
 %{_libdir}/strigi/strigi*.so
 
+
 %changelog
-* Wed Jun 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.3-4
+* Mon Jul 12 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.2-5
+- disable rpmanalyzer support, until crasher(s) fixed (#609541)
+- tidy up spec
+
+* Wed Jun 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.2-4
 - strigi flac analyser crashes with floating point (arithmetic) exception (kdebug234398)
 
 * Mon May 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.2-3



More information about the scm-commits mailing list