rpms/strigi/devel import.log, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 strigi.spec, 1.19, 1.20 strigi-multilib-fix.patch, 1.1, NONE
Lorenzo Villani
arbiter at fedoraproject.org
Fri Oct 17 18:51:32 UTC 2008
- Previous message: rpms/obexd/devel .cvsignore, 1.2, 1.3 obexd.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/kernel/F-8 linux-2.6-drm-i915-fix-ioctl-security.patch, NONE, 1.1 linux-2.6-wan-missing-capability-checks-in-sbni_ioctl.patch, NONE, 1.1 kernel.spec, 1.558, 1.559
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: arbiter
Update of /cvs/pkgs/rpms/strigi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26329/devel
Modified Files:
.cvsignore sources strigi.spec
Added Files:
import.log
Removed Files:
strigi-multilib-fix.patch
Log Message:
import strigi snapshot
--- NEW FILE import.log ---
strigi-0_6_0-0_1_20081017svn870916_fc10:HEAD:strigi-0.6.0-0.1.20081017svn870916.fc10.src.rpm:1224269424
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 20 Jul 2008 17:47:43 -0000 1.9
+++ .cvsignore 17 Oct 2008 18:51:02 -0000 1.10
@@ -1 +1 @@
-strigi-0.5.11.tar.bz2
+strigi-0.6.0.20081017svn870916.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 20 Jul 2008 17:47:43 -0000 1.9
+++ sources 17 Oct 2008 18:51:02 -0000 1.10
@@ -1 +1 @@
-f1fa3488a9c2fe1e8128f4d44088c4ad strigi-0.5.11.tar.bz2
+5f3d9d02a53e6e36100feffe75be972a strigi-0.6.0.20081017svn870916.tar.bz2
Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- strigi.spec 20 Jul 2008 17:58:09 -0000 1.19
+++ strigi.spec 17 Oct 2008 18:51:02 -0000 1.20
@@ -1,19 +1,26 @@
-%define _default_patch_fuzz 2
+%define alphatag .20081017svn870916
Name: strigi
-Version: 0.5.11
-Release: 1%{?dist}
+Version: 0.6.0
+Release: 0.1%{?alphatag}%{?dist}
Summary: A desktop search program for KDE
Group: Applications/Productivity
License: LGPLv2+
URL: http://www.vandenoever.info/software/strigi
-Source0: http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
+
+### SNAPSHOT
+#Source0:CMD svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi strigi-%{version}.`date +%Y%m%d`svn`svn info svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi | grep 'Rev:' | cut -d" " -f4`
+#Source0:CMD tar cjf sources/strigi-%{version}.`date +%Y%m%d`svn`svn info svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi | grep 'Rev:' | cut -d" " -f4`.tar.bz2 strigi-%{version}.`date +%Y%m%d`svn`svn info svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi | grep 'Rev:' | cut -d" " -f4`
+#Source0:CMD rm -rf strigi-%{version}.`date +%Y%m%d`svn`svn info svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi | grep 'Rev:' | cut -d" " -f4`
+Source0: strigi-%{version}%{?alphatag}.tar.bz2
+### Official sources
+#Source0: http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
Source1: strigiclient.desktop
Source2: strigi-daemon.desktop
-Patch0: strigi-multilib-fix.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: cmake >= 2.4.5
+BuildRequires: cmake >= 2.6
BuildRequires: clucene-core-devel qt4-devel dbus-devel
BuildRequires: libxml2-devel expat-devel bzip2-devel zlib-devel
BuildRequires: cppunit-devel exiv2-devel
@@ -50,12 +57,11 @@
Strigi search engine libraries
%prep
-%setup -q
-%patch0 -p0 -b .multilibs
+%setup -q -n strigi-%{version}%{?alphatag}
%build
-mkdir fedora
-cd fedora
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
export FFLAGS="%{optflags}"
@@ -67,12 +73,12 @@
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_DESTINATION=%{_libdir} \
-DLIB_SUFFIX=%{lib_suffix} ..
-make VERBOSE=1 %{?_smp_mflags}
+popd
+make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
-cd fedora
-make DESTDIR=%{buildroot} install
+make -C %{_target_platform} DESTDIR=%{buildroot} install/fast
desktop-file-install \
--vendor="fedora" \
@@ -117,6 +123,10 @@
%{_libdir}/strigi/
%changelog
+* Fri Oct 17 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 0.6.0-0.1.20081017svn870916
+- Update to subversion snapshot (this pre-release of strigi is required by KDE 4.1.6x)
+- Dropped the multilib patch (upstream seems to have it already)
+
* Sun Jul 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.11-1
- Update to 0.5.11
- Drop compile-fix and lucenetest_fix patches (fixed upstream)
@@ -146,7 +156,7 @@
* Tue Oct 30 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.7-1
- Update to 0.5.7 release
-- Fix multilibs conflict (Bug #343221, patch by Kevin Kofler)
+- Fix multilibs conflict (Bug #343221, patch by Kevin Kofler)
* Sun Sep 09 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-2
- Rebuild for BuildID changes
--- strigi-multilib-fix.patch DELETED ---
- Previous message: rpms/obexd/devel .cvsignore, 1.2, 1.3 obexd.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/kernel/F-8 linux-2.6-drm-i915-fix-ioctl-security.patch, NONE, 1.1 linux-2.6-wan-missing-capability-checks-in-sbni_ioctl.patch, NONE, 1.1 kernel.spec, 1.558, 1.559
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list