rpms/gift/FC-4 gift-0.11.8.1-fhs.patch,NONE,1.1 gift.spec,1.2,1.3
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Oct 10 12:27:59 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/gift/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22609
Modified Files:
gift.spec
Added Files:
gift-0.11.8.1-fhs.patch
Log Message:
* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-6
- patch to respect %_bindir,%_datadir,%_includedir,%_libdir (#210114)
gift-0.11.8.1-fhs.patch:
--- NEW FILE gift-0.11.8.1-fhs.patch ---
--- gift-0.11.8.1/configure.ac.fhs 2004-11-26 14:31:05.000000000 -0600
+++ gift-0.11.8.1/configure.ac 2006-10-10 07:00:04.000000000 -0500
@@ -342,22 +342,22 @@
AC_SUBST(prefix)
fi
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
AC_SUBST(libgiftincdir)
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
AC_SUBST(plugindir)
-LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${prefix}/lib/giFT")
+LIBGIFT_DEFINE_UNQUOTED(PLUGIN_DIR, "${libdir}/giFT")
giftdatadir=${prefix}/share/giFT
AC_SUBST(giftdatadir)
if test x$WIN32 != xyes; then
- LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${prefix}/share/giFT")
+ LIBGIFT_DEFINE_UNQUOTED(DATA_DIR, "${datadir}/giFT")
fi
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
AC_SUBST(giftperldir)
dnl ###########################################################################
--- gift-0.11.8.1/configure.fhs 2004-11-27 15:12:59.000000000 -0600
+++ gift-0.11.8.1/configure 2006-10-10 07:01:03.000000000 -0500
@@ -25262,30 +25262,30 @@
fi
-libgiftincdir=${prefix}/include/libgift
+libgiftincdir=${includedir}/libgift
-plugindir=${prefix}/lib/giFT
+plugindir=${libdir}/giFT
cat >>gconfdefs.h <<_ACEOF
#ifndef PLUGIN_DIR
-#define PLUGIN_DIR "${prefix}/lib/giFT"
+#define PLUGIN_DIR "${libdir}/giFT"
#endif
_ACEOF
-giftdatadir=${prefix}/share/giFT
+giftdatadir=${datadir}/giFT
if test x$WIN32 != xyes; then
cat >>gconfdefs.h <<_ACEOF
#ifndef DATA_DIR
-#define DATA_DIR "${prefix}/share/giFT"
+#define DATA_DIR "${datadir}/giFT"
#endif
_ACEOF
fi
-giftperldir=${prefix}/bin
+giftperldir=${bindir}
Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/FC-4/gift.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gift.spec 6 Jan 2006 13:14:44 -0000 1.2
+++ gift.spec 10 Oct 2006 12:27:59 -0000 1.3
@@ -1,16 +1,12 @@
-%if "%{?fedora}" > "2"
+#if "%{?fedora}" > "2" || "%{?rhel}" > "3"
%define _enable_libmagic --enable-libmagic
-%endif
-
-%if "%{?rhel}" > "3"
-%define _enable_libmagic --enable-libmagic
-%endif
+#endif
Name: gift
Summary: Daemon for communicating with filesharing protocols
Version: 0.11.8.1
-Release: 4%{?dist}
+Release: 6%{?dist}
License: GPL
Group: System Environment/Daemons
@@ -19,12 +15,15 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: gift-0.11.8.1-gcc4.patch
+# respect %_bindir,%_datadir,%_includedir,%_libdir
+# http://bugzilla.redhat.com/210114
+Patch2: gift-0.11.8.1-fhs.patch
# Wrapper for auto-launch gift-setup for first-time users
Source1: giftd.sh
BuildRequires: libtool
-%if "%{?fedora}" >= "4"
+%if "%{?fedora}" > "3" || "%{?rhel}" > "4"
BuildRequires: libtool-ltdl-devel
%endif
BuildRequires: libvorbis-devel
@@ -48,6 +47,7 @@
%setup -q
%patch1 -p1 -b .gcc4
+%patch2 -p1 -b .fhs
%build
@@ -85,7 +85,7 @@
%files
%defattr(-,root,root)
-%doc README AUTHORS COPYING HACKING INSTALL QUICKSTART TODO
+%doc AUTHORS COPYING HACKING QUICKSTART README TODO
%{_bindir}/gift*
%{_sbindir}/giftd
%{_datadir}/giFT/
@@ -101,6 +101,15 @@
%changelog
+* Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-6
+- patch to respect %_bindir,%_datadir,%_includedir,%_libdir (#210114)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-5
+- fc6 respin
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4.1
+- fc5: gcc/glibc respin
+
* Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4
- giftd.sh (wrapper): pass on command-line params/options
More information about the fedora-extras-commits
mailing list