rpms/kdiff3/devel kdiff3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Neal Becker (nbecker)
fedora-extras-commits at redhat.com
Sat Sep 23 20:18:56 UTC 2006
Author: nbecker
Update of /cvs/extras/rpms/kdiff3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26132/devel
Modified Files:
.cvsignore sources
Added Files:
kdiff3.spec
Log Message:
auto-import kdiff3-0.9.90-6 on branch devel from kdiff3-0.9.90-6.src.rpm
--- NEW FILE kdiff3.spec ---
Name: kdiff3
Version: 0.9.90
Release: 6%{?dist}
Summary: Compare + merge 2 or 3 files or directories
Group: Development/Tools
License: GPL
URL: http://kdiff3.sourceforge.net/
Source0: http://dl.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdebase-devel, kdelibs-devel, desktop-file-utils
%description
KDiff3 is a program that
- compares and merges two or three input files or directories,
- shows the differences line by line and character by character (!),
- provides an automatic merge-facility and
- an integrated editor for comfortable solving of merge-conflicts
- has support for KDE-KIO (ftp, sftp, http, fish, smb)
- and has an intuitive graphical user interface.
%prep
%setup -q
%build
%configure \
%ifarch x86_64 \
--enable-libsuffix=64 \
%endif \
--disable-rpath
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
HTML_DIR=$(kde-config --expandvars --install html)
# this is junk
rm -rf $RPM_BUILD_ROOT$HTML_DIR/%{name}
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0)
if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
# Desktop.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category Development \
--add-category X-Fedora \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applnk/Development/kdiff3.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/kdiff3
%{_libdir}/kde3/*
%{_datadir}/applications/*
%{_datadir}/apps/*
%{_datadir}/icons/*/*/*/kdiff3.png
%{_datadir}/services/*
%{_mandir}/man1/kdiff3*
%changelog
* Sun Aug 27 2006 Neal Becker <ndbecker2 at gmail.com> - 0.9.90-6
- Untabify
- --add-category X-Fedora
- Add gtk-update-icon-cache
* Fri May 12 2006 Neal Becker <ndbecker2 at gmail.com> - 0.9.88-5
- Remove ldconfig
* Fri May 12 2006 Laurent Rineau <laurent.rineau__fc_extra at normalesup.org> - 0.9.88-5
- Quote percent sign in %%changelog.
- Cleanup in %%files
- Removed Requires: tag.
* Fri May 12 2006 Neal Becker <ndbecker2 at gmail.com> - 0.9.88-4
- Remove applnk stuff
- Add %%post + %%postun
* Fri May 12 2006 Neal Becker <ndbecker2 at gmail.com> - 0.9.88-3
- Fix symlinks (from Rex Dieter)
* Fri May 12 2006 Neal Becker <ndbecker2 at gmail.com> - 0.9.88-2
- Fix source0
- Fix E: kdiff3 standard-dir-owned-by-package /usr/share/icons
E: kdiff3 standard-dir-owned-by-package /usr/share/man
E: kdiff3 standard-dir-owned-by-package /usr/share/man/man1
- Fix Summary
* Thu May 11 2006 Neal Becker <ndbecker2 at gmail.com> - 0.9.88-1
- Initial
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdiff3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 23 Sep 2006 20:17:13 -0000 1.1
+++ .cvsignore 23 Sep 2006 20:18:56 -0000 1.2
@@ -0,0 +1 @@
+kdiff3-0.9.90.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdiff3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 23 Sep 2006 20:17:13 -0000 1.1
+++ sources 23 Sep 2006 20:18:56 -0000 1.2
@@ -0,0 +1 @@
+7224d636e1f1fa577abfbc17192e71bd kdiff3-0.9.90.tar.gz
More information about the scm-commits
mailing list