rpms/ggz-client-libs/F-10 ggz-client-libs-branch-ggz-0-0-14.diff, NONE, 1.1 .cvsignore, 1.4, 1.5 ggz-client-libs.spec, 1.6, 1.7 sources, 1.4, 1.5 ggz-client-libs-snapshot-0.99.4-pkgconfig.patch, 1.1, NONE libggz-snapshot-0.99.4-pkgconfig.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Wed Jan 21 17:01:40 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/ggz-client-libs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18652
Modified Files:
.cvsignore ggz-client-libs.spec sources
Added Files:
ggz-client-libs-branch-ggz-0-0-14.diff
Removed Files:
ggz-client-libs-snapshot-0.99.4-pkgconfig.patch
libggz-snapshot-0.99.4-pkgconfig.patch
Log Message:
* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.0.14.1-2
- Epoch'd downgrade to 0.0.14.1 (at upstream request)
ggz-client-libs-branch-ggz-0-0-14.diff:
--- NEW FILE ggz-client-libs-branch-ggz-0-0-14.diff ---
Property changes on: m4
___________________________________________________________________
Name: svn:externals
- ggz svn://svn.ggzgamingzone.org/svn/trunk/libggz/m4/ggz
+ ggz svn://svn.ggzgamingzone.org/svn/trunk/base-libs/m4/ggz
Index: ggz-config/ggz-config.c
===================================================================
--- ggz-config/ggz-config.c (revision 9744)
+++ ggz-config/ggz-config.c (revision 10862)
@@ -455,17 +455,19 @@
+ strlen(copydir)
+ strlen(modname)
+ strlen(suffix) + 3];
+ char dir_pathname[(moddest ? strlen(destdir) : 0)
+ + strlen(copydir) + 2];
char fixedmodname[strlen(modname) + 1];
unsigned int i;
if(moddest)
- sprintf(global_pathname, "%s/%s", destdir, copydir);
+ sprintf(dir_pathname, "%s/%s", destdir, copydir);
else
- sprintf(global_pathname, "%s", copydir);
+ sprintf(dir_pathname, "%s", copydir);
- if (ggz_make_path(global_pathname) != 0) {
+ if (ggz_make_path(dir_pathname) != 0) {
fprintf(stderr, _("Directory cannot be created (%s)\n"),
- global_pathname);
+ dir_pathname);
return -1;
}
@@ -473,7 +475,7 @@
for(i = 0; i < strlen(fixedmodname); i++) {
if(fixedmodname[i] == '/') fixedmodname[i] = '_';
}
- sprintf(global_pathname, "%s/%s%s", global_pathname, fixedmodname, suffix);
+ sprintf(global_pathname, "%s/%s%s", dir_pathname, fixedmodname, suffix);
printf(_("Preserving %s as %s...\n"), modfile, global_pathname);
return filecopy(modfile, global_pathname);
Index: ggzcore/game.c
===================================================================
--- ggzcore/game.c (revision 9744)
+++ ggzcore/game.c (revision 10862)
@@ -240,7 +240,7 @@
void ggzcore_game_set_server_fd(GGZGame *game, unsigned int fd)
{
if (game)
- return _ggzcore_game_set_server_fd(game, fd);
+ _ggzcore_game_set_server_fd(game, fd);
}
Index: man/Makefile.am
===================================================================
--- man/Makefile.am (revision 9744)
+++ man/Makefile.am (revision 10862)
@@ -1,3 +1,7 @@
+if COND_GGZWRAP
+ggzwrap_man = ggzwrap.1 ggz-wrapper.6
+endif
+
man_MANS = \
ggz-config.6 \
ggz.modules.5 \
@@ -3,12 +7,10 @@
ggzcore_h.3 \
ggzmod_h.3 \
- ggz-wrapper.6 \
- ggzwrap.1 \
ggz.7 \
- ggz.6
+ ggz.6 \
+ $(ggzwrap_man)
EXTRA_DIST = \
- ggz-wrapper.6 \
- ggzwrap.1 \
ggz.7 \
- ggz.6
+ ggz.6 \
+ $(ggzwrap_man)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ggz-client-libs/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 24 Aug 2008 19:24:21 -0000 1.4
+++ .cvsignore 21 Jan 2009 17:01:10 -0000 1.5
@@ -1 +1 @@
-ggz-client-libs-snapshot-0.99.4.tar.gz
+ggz-client-libs-0.0.14.1.tar.gz
Index: ggz-client-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ggz-client-libs/F-10/ggz-client-libs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ggz-client-libs.spec 24 Aug 2008 19:27:44 -0000 1.6
+++ ggz-client-libs.spec 21 Jan 2009 17:01:10 -0000 1.7
@@ -1,27 +1,29 @@
-#define _enable_ggzwrap --enable-ggzwrap
-
Summary: Client libraries for GGZ gaming zone
Name: ggz-client-libs
-Version: 0.99.4
-Release: 1%{?dist}
+%if 0%{?fedora} > 9
+Epoch: 1
+%endif
+Version: 0.0.14.1
+Release: 2%{?dist}
License: LGPLv2+ and GPLv2+
Group: System Environment/Libraries
URL: http://www.ggzgamingzone.org/
-#Source0: http://ftp.belnet.be/packages/ggzgamingzone/ggz/%{version}/ggz-client-libs-%{version}.tar.gz
-Source0: http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/ggz-client-libs-snapshot-0.99.4.tar.gz
+Source0: http://ftp.belnet.be/packages/ggzgamingzone/ggz/%{version}/ggz-client-libs-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: ggz-client-libs-snapshot-0.99.4-pkgconfig.patch
+# upstream patches
+Patch100: http://hq.ggzgamingzone.org/~josef/diffs/0.0.14.1/ggz-client-libs-branch-ggz-0-0-14.diff
Source1: ggz.modules
-# FIXME: add reference to ggz packaging guidelines
+# See https://fedoraproject.org/wiki/PackagingDrafts/GGZ
Source2: macros.ggz
+BuildRequires: automake libtool
BuildRequires: expat-devel
BuildRequires: gettext
-BuildRequires: libggz-devel >= %{version}
+BuildRequires: libggz-devel = %{?epoch:%{epoch}:}%{version}
%description
GGZ (which is a recursive acronym for GGZ Gaming Zone) develops libraries,
@@ -31,9 +33,8 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: libggz-devel >= %{version}
-Requires: pkgconfig
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: libggz-devel = %{?epoch:%{epoch}:}%{version}
# %{_sysconfdir}/rpm ownership
Requires: rpm
%description devel
@@ -41,21 +42,19 @@
%prep
-%setup -q -n %{name}-snapshot-%{version}
+%setup -q
-%patch1 -p1 -b .pkgconfig
+%patch100 -p0 -b .upstream
-# Avoid lib64 rpaths, FIXME better.
-%if "%{_libdir}" != "/usr/lib"
-sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
-%endif
+rm -f m4/libtool.m4
+autoreconf -i -f
%build
%configure \
--disable-debug \
--disable-static \
- %{?_enable_ggzwrap} %{?!_enable_ggzwrap:--disable-ggzwrap}
+ --disable-ggzwrap
make %{?_smp_mflags}
@@ -74,13 +73,12 @@
# RPM macros
install -D -m644 -p %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.ggz
-%find_lang ggzcore_snapshot-%{version}
+%find_lang ggzcore
%find_lang ggz-config
cat ggz*.lang >> all.lang
# unpackaged files
rm -f %{buildroot}%{_libdir}/lib*.la
-%{!?_enable_ggzwrap:rm -f %{buildroot}%{_mandir}/man1/ggzwrap.1*}
%post -p /sbin/ldconfig
@@ -98,17 +96,12 @@
%config(noreplace) %{_sysconfdir}/ggz.modules
# GPLv2+
%{_bindir}/ggz-config
-%if 0%{?_enable_ggzwrap:1}
-%{_bindir}/ggz
-%{_bindir}/ggz-wrapper
-%{_mandir}/man1/ggzwrap.1*
-%endif
%dir %{_datadir}/ggz
%dir %{_libdir}/ggz
-%{_libdir}/libggzmod.so.*
+%{_libdir}/libggzmod.so.4*
%{_mandir}/man5/ggz.modules.5*
# LGPLv2+
-%{_libdir}/libggzcore.so.*
+%{_libdir}/libggzcore.so.9*
%{_mandir}/man6/ggz*
%{_mandir}/man7/ggz*
%{_sysconfdir}/xdg/menus/applications-merged/ggz.merge.menu
@@ -121,16 +114,17 @@
# GPLv2+
%{_includedir}/ggzmod.h
%{_libdir}/libggzmod.so
-%{_libdir}/pkgconfig/ggzmod.pc
%{_mandir}/man3/ggzmod_h.3*
# LGPLv2+
%{_includedir}/ggzcore.h
%{_libdir}/libggzcore.so
-%{_libdir}/pkgconfig/ggzcore.pc
%{_mandir}/man3/ggzcore_h.3*
%changelog
+* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.0.14.1-2
+- Epoch'd downgrade to 0.0.14.1 (at upstream request)
+
* Sun Aug 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.99.4-1
- ggz-client-libs-snapshot-0.99.4
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ggz-client-libs/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 24 Aug 2008 19:24:21 -0000 1.4
+++ sources 21 Jan 2009 17:01:10 -0000 1.5
@@ -1 +1 @@
-9be065d5b757079a092a97f6d750b3a5 ggz-client-libs-snapshot-0.99.4.tar.gz
+299eaa93721b1d867b5bf7dc6ac764b0 ggz-client-libs-0.0.14.1.tar.gz
--- ggz-client-libs-snapshot-0.99.4-pkgconfig.patch DELETED ---
--- libggz-snapshot-0.99.4-pkgconfig.patch DELETED ---
More information about the scm-commits
mailing list