Hello community, here is the log from the commit of package mgdiff checked in at Wed Aug 2 16:29:27 CEST 2006. -------- --- mgdiff/mgdiff.changes 2006-03-07 11:31:44.000000000 +0100 +++ mgdiff/mgdiff.changes 2006-08-02 16:25:10.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 2 16:24:56 CEST 2006 - werner@suse.de + +- Make it build with X11R7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mgdiff.spec ++++++ --- /var/tmp/diff_new_pack.dJQILh/_old 2006-08-02 16:29:20.000000000 +0200 +++ /var/tmp/diff_new_pack.dJQILh/_new 2006-08-02 16:29:20.000000000 +0200 @@ -16,13 +16,25 @@ Group: Productivity/Text/Utilities Autoreqprov: on Version: 1.0.1 -Release: 5 +Release: 14 Summary: Compare Files Side by Side BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: mgdiff-1.0.tar.bz2 Source1: mgdiff.desktop Patch: mgdiff-1.0.dif Patch1: mgdiff-1.0.1.diff +%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} +%if "%_exec_prefix" == "/usr/X11R6" + +%global _mandir %{_exec_prefix}/man +%define _x11data %{_exec_prefix}/lib/X11 +%define _appdefdir %{_x11data}/app-defaults +%define _mgdifflnk ../lib/X11/mgdiff +%else +%define _x11data %{_datadir}/X11 +%define _appdefdir %{_x11data}/app-defaults +%define _mgdifflnk ../share/X11/mgdiff +%endif %description Mgdiff is a graphical front-end to the Unix diff command based on X11 @@ -46,36 +58,34 @@ make CCOPTIONS="$RPM_OPT_FLAGS" %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install -make DESTDIR=$RPM_BUILD_ROOT install.man -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/mgdiff -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/man/man1 +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install.man +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_x11data}/mgdiff +mkdir -p %{buildroot}%{_mandir}/man1 test -e debian/cvsmgdiff.1x || mv debian/cvsmgdiff.1 debian/cvsmgdiff.1x -install -m 0755 debian/cvsmgdiff $RPM_BUILD_ROOT/usr/X11R6/bin/ -install -m 0755 debian/rmgdiff $RPM_BUILD_ROOT/usr/X11R6/lib/mgdiff/ -install -m 0755 debian/rmgdiff.awk $RPM_BUILD_ROOT/usr/X11R6/lib/mgdiff/ -ln -sf ../lib/mgdiff/rmgdiff $RPM_BUILD_ROOT/usr/X11R6/bin/ -install -m 0640 debian/cvsmgdiff.1x $RPM_BUILD_ROOT/usr/X11R6/man/man1/ -install -m 0640 debian/rmgdiff.1x $RPM_BUILD_ROOT/usr/X11R6/man/man1/ +install -m 0755 debian/cvsmgdiff %{buildroot}%{_bindir}/ +install -m 0755 debian/rmgdiff %{buildroot}%{_x11data}/mgdiff/ +install -m 0755 debian/rmgdiff.awk %{buildroot}%{_x11data}/mgdiff/ +ln -sf %{_mgdifflnk}/rmgdiff %{buildroot}%{_bindir}/ +install -m 0640 debian/cvsmgdiff.1x %{buildroot}%{_mandir}/man1/ +install -m 0640 debian/rmgdiff.1x %{buildroot}%{_mandir}/man1/ %suse_update_desktop_file -i %name Development RevisionControl -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc README /usr/share/applications/*.desktop -%docdir /usr/X11R6/man -/usr/X11R6/bin/*diff -%dir /usr/X11R6/lib/mgdiff -/usr/X11R6/lib/mgdiff/rmgdiff* -%config /usr/X11R6/lib/X11/app-defaults/Mgdiff -%doc /usr/X11R6/man/man1/*.1x.gz +%{_bindir}/*diff +%dir %{_x11data}/mgdiff +%{_x11data}/mgdiff/rmgdiff* +%config %{_appdefdir}/Mgdiff +%doc %{_mandir}/man1/*.1x.gz %changelog -n mgdiff +* Wed Aug 02 2006 - werner@suse.de +- Make it build with X11R7 * Tue Mar 07 2006 - werner@ssue.de - Change order of setlocale() and XtSetLanguageProc() (bug #155300) * Wed Jan 25 2006 - mls@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...