diff --git a/kdiff3.spec b/kdiff3.spec index 7b59422..3fb3c1f 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -1,6 +1,6 @@ Name: kdiff3 Version: 0.9.96 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Compare + merge 2 or 3 files or directories Group: Development/Tools @@ -14,8 +14,9 @@ Patch0: kdiff3part.desktop.diff # No longer needed for 0.9.96 # Install kdiff3_part.rc into correct location # Patch1: kdiff3part.rc.diff +# No longer needed for 0.9.96 # fix build against kde-4.5 (pre)releases -Patch2: kdiff3-0.9.95-docbook_fixes.patch +# Patch2: kdiff3-0.9.95-docbook_fixes.patch BuildRequires: desktop-file-utils BuildRequires: gettext @@ -35,7 +36,6 @@ KDiff3 is a program that %prep %setup -q -n %{name}-%{version} %patch0 -p0 -%patch2 -p1 -b .docbook_fixes %build mkdir -p %{_target_platform} @@ -100,6 +100,9 @@ update-desktop-database -q &> /dev/null %changelog +* Sat Sep 3 2011 Neal Becker - 0.9.96-4 +- Remove patch2 + * Sat Sep 3 2011 Neal Becker - 0.9.96-3 - Remove patch1