rpms/poker2d/F-8 poker2d-1.2.0-configure.patch, NONE, 1.1 poker2d.spec, 1.6, 1.7
Christopher Stone (xulchris)
fedora-extras-commits at redhat.com
Mon Oct 22 02:56:34 UTC 2007
Author: xulchris
Update of /cvs/extras/rpms/poker2d/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv631/F-8
Modified Files:
poker2d.spec
Added Files:
poker2d-1.2.0-configure.patch
Log Message:
move arch specific poker-network-devel to this spec file
poker2d-1.2.0-configure.patch:
--- NEW FILE poker2d-1.2.0-configure.patch ---
--- configure.ac~ 2007-10-21 14:13:57.000000000 -0700
+++ configure.ac 2007-10-21 14:17:31.000000000 -0700
@@ -74,7 +74,7 @@
pkgsysconfdir=$sysconfdir/$PACKAGE
AC_SUBST(pkgsysconfdir, [$pkgsysconfdir])
-pkglibdir=$libdir/$PACKAGE
+pkglibdir=$libexecdir/$PACKAGE
AC_SUBST(pkglibdir, [$pkglibdir])
pkgdatadir=$datadir/$PACKAGE
AC_SUBST(pkgdatadir, [$pkgdatadir])
Index: poker2d.spec
===================================================================
RCS file: /cvs/extras/rpms/poker2d/F-8/poker2d.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- poker2d.spec 3 Oct 2007 22:18:28 -0000 1.6
+++ poker2d.spec 22 Oct 2007 02:56:02 -0000 1.7
@@ -3,19 +3,20 @@
Name: poker2d
Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GTK poker client to play on a poker-network server
Group: Amusements/Games
License: GPLv2+
URL: http://pokersource.org/poker-network
Source0: http://download.gna.org/pokersource/sources/poker-network-%{version}.tar.gz
+Patch0: %{name}-1.2.0-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils hicolor-icon-theme ImageMagick gettext
-BuildRequires: python-devel poker-network-devel poker-engine-devel >= 1.0.21
+BuildRequires: python-devel poker-engine-devel >= 1.0.21
BuildRequires: glib2-devel libglade2-devel pygtk2-devel pygtk2-libglade
-BuildRequires: MySQL-python
+BuildRequires: MySQL-python libtool gettext-devel
Requires: python-simplejson, pygame, %{name}-common = %{version}-%{release}
%description
@@ -33,6 +34,17 @@
%description common
%{summary}.
+%package -n poker-network-devel
+Summary: Client library development files
+Group: Development/Libraries
+Requires: %{name}-common = %{version}-%{release}
+Requires: poker-eval-devel
+
+%description -n poker-network-devel
+This package contains files required to build applications that use
+%{name}.
+
+
%package kde
Summary: KDE specific files for poker2d
Group: Amusements/Games
@@ -45,6 +57,8 @@
%prep
%setup -qn poker-network-%{version}
+%patch0 -p0 -b .configure~
+autoreconf --force --install
# create poker2d desktop file
cat > %{name}.desktop << EOF
@@ -95,11 +109,6 @@
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/poker2D*.xpm
-# relocate poker-interface shared library
-install -d $RPM_BUILD_ROOT%{_libexecdir}
-mv $RPM_BUILD_ROOT%{_libdir}/poker-network/poker-interface \
- $RPM_BUILD_ROOT%{_libexecdir}
-
# relocate poker2d binary
install -d $RPM_BUILD_ROOT%{_bindir}
mv $RPM_BUILD_ROOT%{_exec_prefix}/games/%{name} \
@@ -143,7 +152,6 @@
rm -f $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/user*
rm -f $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/version*
rm -fr $RPM_BUILD_ROOT%{python_sitelib}/pokerui
-rm -fr $RPM_BUILD_ROOT%{_libdir}/pkgconfig
rm -f $RPM_BUILD_ROOT%{_sbindir}/*
rm -fr $RPM_BUILD_ROOT%{_datadir}/man/man8
rm -f $RPM_BUILD_ROOT%{_datadir}/poker-network/*.sql
@@ -193,7 +201,12 @@
%files common -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
-%{_libexecdir}/poker-interface
+%{_libexecdir}/poker-network/poker-interface
+
+%files -n poker-network-devel
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/pkgconfig/poker-network.pc
%files kde
%defattr(-,root,root,-)
@@ -202,6 +215,10 @@
%changelog
+* Sun Oct 21 2007 Christopher Stone <chris.stone at gmail.com> 1.2.0-2
+- Move pkgconfig file into this spec since it is arch specific
+- Add patch to properly handle libexec
+
* Wed Oct 03 2007 Christopher Stone <chris.stone at gmail.com> 1.2.0-1
- Upstream sync
More information about the fedora-extras-commits
mailing list