Browse Source

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6728 ec354946-7b23-47d6-9f5a-488ba84defc7

kudoh 11 years ago
parent
commit
ebac9e0ac4
1 changed files with 28 additions and 12 deletions
  1. 28 12
      k/kdiff3/kdiff3-vl.spec

+ 28 - 12
k/kdiff3/kdiff3-vl.spec

@@ -1,7 +1,7 @@
 Name: kdiff3
 Summary: Tool for Comparison and Merge of Files and Directories
-Summary(ja): ファイルやディレクトリの比較/マージを行うツール
-Version: 0.9.96
+Summary(ja): ファイルやディレクトリの比較/マージを行うツール
+Version: 0.9.97
 Release: 1%{?_dist_release}
 
 URL: http://kdiff3.sourceforge.net/
@@ -11,11 +11,11 @@ Group: Development/Tools
 Source: http://downloads.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
 
 # Remove bogus MimeType tag from kdiff3part.desktop
-Patch0:         kdiff3part.desktop.diff
+#Patch0:         kdiff3part.desktop.diff
 # Install kdiff3_part.rc into correct location
 #Patch1:		kdiff3part.rc.diff
 # fix build against kde-4.5 (pre)releases
-#Patch2:		kdiff3-0.9.95-docbook_fixes.patch     
+#Patch2:		kdiff3-0.9.95-docbook_fixes.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -28,14 +28,17 @@ BuildRequires: libXext-devel
 BuildRequires: libXdmcp-devel
 BuildRequires: libXft-devel
 BuildRequires: libXpm-devel
-BuildRequires: kdelibs4-devel >= 4.1
-BuildRequires: kdebase4-devel
+#BuildRequires: kdelibs4-devel >= 4.1
+#BuildRequires: kdebase4-devel
+BuildRequires: kdelibs-devel >= 4.1
+BuildRequires: kdebase-devel
 BuildRequires: phonon-devel
 BuildRequires: qt4-devel >= 4.4
 BuildRequires: openssl-devel
 BuildRequires: soprano-devel
 BuildRequires: libX11-devel
-Requires: kdelibs4 > 4.1
+#Requires: kdelibs4 > 4.1
+Requires: kdelibs > 4.1
 
 %description
 Shows the differences line by line and character by character (!).
@@ -46,12 +49,18 @@ Unicode & UTF-8 support
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+#%patch0 -p1
 #%patch1 -p1
 #%patch2 -p1 -b .docbook_fixes
 
 %build
+%ifarch %{ix86}
 export QTDIR=/usr/lib/qt4
+%endif
+%ifarch x86_64
+export QTDIR=/usr/lib64/qt4
+%endif
+
 cmake . -DCMAKE_INSTALL_PREFIX=/usr
 %{__make} %{?_smp_mflags}
 
@@ -61,13 +70,13 @@ make install DESTDIR=%{buildroot}
 
 # Desktop.
 desktop-file-install --vendor="" \
-    --dir=$RPM_BUILD_ROOT%{_datadir}/kde4/services \
-    $RPM_BUILD_ROOT%{_datadir}/kde4/services/kdiff3part.desktop
+    --dir=%{buildroot}%{_datadir}/kde4/services \
+    %{buildroot}%{_datadir}/kde4/services/kdiff3part.desktop
 
 desktop-file-install  --vendor="" \
-    --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde4  \
+    --dir=%{buildroot}%{_datadir}/applications/kde4  \
     --add-category=Development \
-        $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kdiff3.desktop
+        %{buildroot}%{_datadir}/applications/kde4/kdiff3.desktop
 
 # locale's
 #%find_lang %{name} || touch %{name}.lang
@@ -108,6 +117,13 @@ fi
 %{_libdir}/kde4/*
 
 %changelog
+* Thu Aug 16 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.9.97-1
+- new upstream release
+- deleted Patch0
+- changed BuildRequires: kdelibs4-devel >= 4.1, kdebase4-devel to 
+  kdelibs-devel >= 4.1, kdebase-devel
+- changed Requires: kdelibs4 > 4.1 to kdelibs > 4.1
+
 * Tue Sep 20 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.9.96-1
 - new upstream release
 - refreshed patch0