fix BTS:1005 and BTS:1006

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1228 ec354946-7b23-47d6-9f5a-488ba84defc7

f/freetype/freetype-vl.spec

@@ -2,7 +2,7 @@
 Summary: A free and portable TrueType font rendering engine.
 Name: freetype
 Version: 1.3.1
-Release: 6%{?_dist_release}
+Release: 7%{?_dist_release}
 License: BSD-like
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -16,6 +16,9 @@ Patch4: freetype-1.3.1-ltconfig-compat32.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: freetype-utils
+BuildRequires:	libX11-devel
+BuildRequires:	libXt-devel
+BuildRequires:	imake
 
 %description
 The FreeType engine is a free and portable TrueType font rendering
@@ -38,6 +41,7 @@ library.
 %package devel
 Summary: Header files and static library for development with FreeType.
 Group: Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 The freetype-devel package contains the header files and static
@@ -48,6 +52,7 @@ Install freetype-devel if you want to develop FreeType
 applications. If you simply want to run existing applications, you
 won't need this package.
 
+%if %{build_compat32}
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
 Summary: A free and portable TrueType font rendering engine.
@@ -72,6 +77,7 @@ FreeType TrueType font rendering library.
 Install freetype-devel if you want to develop FreeType
 applications. If you simply want to run existing applications, you
 won't need this package.
+%endif
 
 %prep
 %setup -q
@@ -96,7 +102,7 @@ export CC='gcc -m32'
 	--enable-static --enable-shared \
 	--with-locale-dir=%{_localedir} \
 	--libdir=%{_libdir} \
-	--x-libraries=%{_prefix}/X11R6/%{_lib} \
+	--x-libraries=%{_libdir} \
 	--target=%{_target_platform}
 
 make
@@ -155,7 +161,6 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if !%{build_compat32}
 %files
 %defattr(-,root,root)
 %{_libdir}/libttf.la
@@ -176,7 +181,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/libttf.so
 %{_libdir}/libttf.a
-%endif
 
 ## to build compat32 for x86_64 architecture support
 %if %{build_compat32}
@@ -192,6 +196,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jun 21 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.5.1-7
+- add Requires: %{name} = %{version}-%{release} (devel package)
+- add BuildRequires: libX11-devel, libXt-devel, imake
+- change configure option
+    (from "--x-libraries=%{_prefix}/X11R6/%{_lib}" to "--x-libraries=%{_libdir}")
+
 * Wed Mar 26 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 1.5.1-6
 - obsolete freetype-utils
 

g/glitz/glitz-vl.spec

@@ -1,13 +1,15 @@
 Summary:	OpenGL image compositing library.
 Name:		glitz
 Version:	0.5.6
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Group:		System Environment/Libraries
 License:	LGPL
 Source0:        %{name}-%{version}.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:  mesa-libGL-devel
+BuildRequires:	libX11-devel
+BuildRequires:	libXt-devel
 
 %description
 Glitz is an OpenGL image compositing library. Glitz provides Porter/Duff
@@ -17,7 +19,9 @@ including trapezoids, triangles, and rectangles.
 %package 	devel
 Summary: 	Development files for glitz
 Group: 		Development/Libraries
+Requires:       %{name} = %{version}-%{release}
 Requires:	libGL-devel
+Requires:	libX11-devel
 
 %description 	devel
 Development files for glitz.
@@ -51,6 +55,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 21 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.5.6-2
+- add Requires: %{name} = %{version}-%{release} (devel package)
+- add Requires: libX11-devel (devel package)
+- add BuildRequires: libX11-devel, libXt-devel
+
 * Tue Sep 09 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.6-1
 - new upstream release
 - new versioning policy