Hello community, here is the log from the commit of package xmbdfed checked in at Mon Aug 14 18:30:08 CEST 2006. -------- --- xmbdfed/xmbdfed.changes 2006-01-25 21:43:14.000000000 +0100 +++ xmbdfed/xmbdfed.changes 2006-08-14 17:17:41.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 14 17:13:29 CEST 2006 - lmichnovic@suse.cz + +- removed libpath to specify it in spec file (in freetype2.patch) +- omitting X11R6 in installation paths + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmbdfed.spec ++++++ --- /var/tmp/diff_new_pack.4ARJOs/_old 2006-08-14 18:28:33.000000000 +0200 +++ /var/tmp/diff_new_pack.4ARJOs/_new 2006-08-14 18:28:33.000000000 +0200 @@ -5,16 +5,16 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: xmbdfed -BuildRequires: freetype2-devel openmotif openmotif-devel update-desktop-files xorg-x11 +BuildRequires: freetype2-devel openmotif openmotif-devel update-desktop-files xorg-x11 xorg-x11-devel Summary: A Motif-based BDF font editor Version: 4.7 -Release: 2 +Release: 14 License: X11/MIT Group: Productivity/Graphics/Bitmap Editors URL: http://crl.nmsu.edu/~mleisher/xmbdfed.html @@ -58,14 +58,17 @@ %patch2 %build -export RPM_OPT_FLAGS -make +%if "%(xft-config --prefix)" == "/usr" +make %{?jobs:-j%jobs} CCOPT="$RPM_OPT_FLAGS" LIBPATH="-L/usr/%{_lib}" +%else +make %{?jobs:-j%jobs} CCOPT="$RPM_OPT_FLAGS" LIBPATH="-L/usr/X11R6/%{_lib}" +%endif %install -install -d -m 755 ${RPM_BUILD_ROOT}/usr/X11R6/bin -install -d -m 755 ${RPM_BUILD_ROOT}/usr/X11R6/man/man1 -install -m 755 xmbdfed ${RPM_BUILD_ROOT}/usr/X11R6/bin -install -m 644 xmbdfed.man ${RPM_BUILD_ROOT}/usr/X11R6/man/man1/xmbdfed.1 +install -d -m 755 ${RPM_BUILD_ROOT}/usr/bin +install -d -m 755 ${RPM_BUILD_ROOT}/usr/share/man/man1 +install -m 755 xmbdfed ${RPM_BUILD_ROOT}/usr/bin +install -m 644 xmbdfed.man ${RPM_BUILD_ROOT}/usr/share/man/man1/xmbdfed.1 %suse_update_desktop_file -i %name Graphics VectorGraphics %clean @@ -74,11 +77,14 @@ %files %defattr(-,root,root) /usr/share/applications/xmbdfed.desktop -/usr/X11R6/bin/xmbdfed +/usr/bin/xmbdfed %doc README COPYRIGHTS CHANGES -%doc /usr/X11R6/man/man1/xmbdfed.1.gz +%doc %{_mandir}/man1/xmbdfed.1.gz %changelog -n xmbdfed +* Mon Aug 14 2006 - lmichnovic@suse.cz +- removed libpath to specify it in spec file (in freetype2.patch) +- omitting X11R6 in installation paths * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Mon Jan 16 2006 - schwab@suse.de ++++++ xmbdfed-4.7-freetype2.patch ++++++ --- /var/tmp/diff_new_pack.4ARJOs/_old 2006-08-14 18:28:33.000000000 +0200 +++ /var/tmp/diff_new_pack.4ARJOs/_new 2006-08-14 18:28:33.000000000 +0200 @@ -47,8 +47,8 @@ # -#INCS = -I/usr/X11/include $(FTYPE_INCS) -#LIBS = -L/usr/X11/lib -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS) -+INCS = -I/usr/X11R6/include $(FTYPE_INCS) -+LIBS = -L/usr/X11R6/lib -L/usr/X11R6/lib64 -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS) ++INCS = -I/usr/include -I/usr/X11R6/include $(FTYPE_INCS) ++LIBS = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS) # # Uncomment these for HPUX. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org