rpms/libXdmcp/devel libXdmcp.spec,1.11,1.12
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jun 7 21:13:20 UTC 2006
Author: mharris
Update of /cvs/dist/rpms/libXdmcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2205
Modified Files:
libXdmcp.spec
Log Message:
* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added "BuildRequires: xorg-x11-proto-devel"
- Added "Requires: xorg-x11-proto-devel" to devel package, needed by xdmcp.pc
- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.
Index: libXdmcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdmcp/devel/libXdmcp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXdmcp.spec 27 Apr 2006 19:47:28 -0000 1.11
+++ libXdmcp.spec 7 Jun 2006 21:13:18 -0000 1.12
@@ -1,13 +1,14 @@
Summary: X.Org X11 libXdmcp runtime library
Name: libXdmcp
Version: 1.0.1
-Release: 1
+Release: 2
License: MIT/X11
Group: System Environment/Libraries
URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
@@ -19,8 +20,11 @@
%package devel
Summary: X.Org X11 libXdmcp development package
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# xorg-x11-proto-devel is needed by xdmcp.pc
+Requires: xorg-x11-proto-devel
Obsoletes: XFree86-devel, xorg-x11-devel
@@ -34,7 +38,6 @@
%define with_static 0
%build
-
%configure \
%if ! %{with_static}
--disable-static
@@ -42,9 +45,9 @@
make
%install
-
rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
# We intentionally don't ship *.la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -58,7 +61,6 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
%{_libdir}/libXdmcp.so.6
%{_libdir}/libXdmcp.so.6.0.0
@@ -73,6 +75,12 @@
%{_libdir}/pkgconfig/xdmcp.pc
%changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Added "BuildRequires: xorg-x11-proto-devel"
+- Added "Requires: xorg-x11-proto-devel" to devel package, needed by xdmcp.pc
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
- Update to 1.0.1
More information about the fedora-cvs-commits
mailing list