Attachment 309861 Details for Bug 191473 – removing two lines from doc/nl/index.docbook allows build in C4

removing two lines from doc/nl/index.docbook allows build in C4

kdiff3.spec (text/x-rpm-spec), 5.00 KB, created by manuel wolfshant on 2008-06-19 16:03:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: manuel wolfshant

Created: 2008-06-19 16:03:17 UTC

Size: 5.00 KB

patch

obsolete

>Name:           kdiff3
>Version:        0.9.92
>Release: 	15%{?dist}
>Summary:        Compare + merge 2 or 3 files or directories
>
>Group:          Development/Tools
>License:        GPLv2
>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)
>
>%if 0%{?rhel}
>BuildRequires:  kdebase-devel, kdelibs-devel, desktop-file-utils
>%else
>BuildRequires:  kdebase3-devel, kdelibs3-devel, desktop-file-utils
>%endif
>
>%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
>unset QTDIR || : ; source /etc/profile.d/qt.sh
>%configure \
>         --disable-rpath
>#in C4 docbook build bails out because of this
>%if "0%{?dist}" == "0.el4"
>        sed -i -e "/\&Sander.Koning/d;/\&meld.fouten/d" doc/nl/index.docbook
>%endif
>
>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
>
>echo "NoDisplay=true" >> \
>$RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/kdiff3plugin.desktop
>desktop-file-install  --vendor="" \
>     --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
>     --delete-original \
>     $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/kdiff3plugin.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
>
>* Thu Jun 19 2008 Manuel "lonely wolf" Wolfshant <wolfy@fedoraproject.org> - 0.9.92-15
>- fix docbook index, allowing build in EPEL-4
>
>* Thu Jun 5 2008 Manuel "lonely wolf" Wolfshant <wolfy@fedoraproject.org> - 0.9.92-14
>- add a conditional BR, allowing build in EPEL-5
>
>* Tue Mar 25 2008 Rex Dieter <rdieter@fedoraproject.org> - 0.9.92-13
>- drop BR: qt-devel (broken)
>- omit 64bit configure hack (invalid and not needed)
>
>* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.9.92-12
>- Autorebuild for GCC 4.3
>
>* Sun Dec  2 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.92-11
>- BR qt-devel
>- source /etc/profile.d/qt.sh for mock
>
>* Wed Nov  7 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.92-10
>- Update desktop-file-install as suggest by Rex
>
>* Wed Nov  7 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.92-8
>- Use desktop-file-install for kdiff3plugin.desktop
>
>* Tue Nov  6 2007 Neal Becker <ndbecker2@gmail.com> - 0.9.92-7
>- Update to 0.9.92
>- Add /usr/share/applnk/.hidden/kdiff3plugin.desktop
>
>* Thu Oct 05 2006 Christian Iseli <Christian.Iseli@licr.org> 0.9.90-7
> - rebuilt for unwind info generation, broken in gcc-4.1.1-21
>
>* Sun Aug 27 2006 Neal Becker <ndbecker2@gmail.com> - 0.9.90-6
>- Untabify
>- --add-category X-Fedora
>- Add gtk-update-icon-cache
>
>* Fri May 12 2006 Neal Becker <ndbecker2@gmail.com> - 0.9.88-5
>- Remove ldconfig
>* Fri May 12 2006 Laurent Rineau <laurent.rineau__fc_extra@normalesup.org> - 0.9.88-5
>- Quote percent sign in %%changelog.
>- Cleanup in %%files
>- Removed Requires: tag.
>
>
>* Fri May 12 2006 Neal Becker <ndbecker2@gmail.com> - 0.9.88-4
>- Remove applnk stuff
>- Add %%post + %%postun
>
>* Fri May 12 2006 Neal Becker <ndbecker2@gmail.com> - 0.9.88-3
>- Fix symlinks (from Rex Dieter)
>
>* Fri May 12 2006 Neal Becker <ndbecker2@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@gmail.com> - 0.9.88-1
>- Initial
>

Actions: View

Attachments on bug 191473: 128943 | 308486 | 309861