rpms/libstroke/FC-6 libstroke-aclocal.patch, NONE, 1.1 libstroke.spec, 1.1, 1.2
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Thu Mar 1 17:05:13 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/libstroke/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13844/FC-6
Modified Files:
libstroke.spec
Added Files:
libstroke-aclocal.patch
Log Message:
auto-import libstroke-0.5.1-14 on branch FC-6 from libstroke-0.5.1-14.src.rpm
libstroke-aclocal.patch:
--- NEW FILE libstroke-aclocal.patch ---
diff -dur libstroke-0.5.1.ORIG/libgstroke.m4 libstroke-0.5.1/libgstroke.m4
--- libstroke-0.5.1.ORIG/libgstroke.m4 2001-07-05 06:44:54.000000000 -0600
+++ libstroke-0.5.1/libgstroke.m4 2007-02-28 17:10:21.000000000 -0700
@@ -26,7 +26,7 @@
dnl if different from name
dnl description (optional) used to construct help string
dnl
-AC_DEFUN(smr_ARG_WITHLIB, [
+AC_DEFUN([smr_ARG_WITHLIB], [
ifelse($2, , smr_lib=[$1], smr_lib=[$2])
@@ -74,7 +74,7 @@
dnl extra-flags (optional) flags required when compiling the
dnl header, typically more includes; for ex. X_CFLAGS
dnl
-AC_DEFUN(smr_ARG_WITHINCLUDES, [
+AC_DEFUN([smr_ARG_WITHINCLUDES] , [
AC_ARG_WITH([$1]-includes,
[ --with-$1-includes=DIR set directory for $1 headers],
@@ -116,7 +116,7 @@
dnl x-libs (optional) extra libraries, if needed to link with lib
dnl x-flags (optional) extra flags, if needed to include header files
dnl
-AC_DEFUN(smr_CHECK_LIB,
+AC_DEFUN([smr_CHECK_LIB],
[
ifelse($2, , smr_lib=[$1], smr_lib=[$2])
ifelse($5, , , smr_header=[$5])
diff -dur libstroke-0.5.1.ORIG/libstroke.m4 libstroke-0.5.1/libstroke.m4
--- libstroke-0.5.1.ORIG/libstroke.m4 2001-07-05 06:44:54.000000000 -0600
+++ libstroke-0.5.1/libstroke.m4 2007-02-28 17:09:46.000000000 -0700
@@ -26,7 +26,7 @@
dnl if different from name
dnl description (optional) used to construct help string
dnl
-AC_DEFUN(smr_ARG_WITHLIB, [
+AC_DEFUN([smr_ARG_WITHLIB], [
ifelse($2, , smr_lib=[$1], smr_lib=[$2])
@@ -74,7 +74,7 @@
dnl extra-flags (optional) flags required when compiling the
dnl header, typically more includes; for ex. X_CFLAGS
dnl
-AC_DEFUN(smr_ARG_WITHINCLUDES, [
+AC_DEFUN([smr_ARG_WITHINCLUDES], [
AC_ARG_WITH([$1]-includes,
[ --with-$1-includes=DIR set directory for $1 headers],
@@ -116,7 +116,7 @@
dnl x-libs (optional) extra libraries, if needed to link with lib
dnl x-flags (optional) extra flags, if needed to include header files
dnl
-AC_DEFUN(smr_CHECK_LIB,
+AC_DEFUN([smr_CHECK_LIB],
[
ifelse($2, , smr_lib=[$1], smr_lib=[$2])
ifelse($5, , , smr_header=[$5])
Index: libstroke.spec
===================================================================
RCS file: /cvs/extras/rpms/libstroke/FC-6/libstroke.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libstroke.spec 1 Sep 2006 06:53:29 -0000 1.1
+++ libstroke.spec 1 Mar 2007 17:04:40 -0000 1.2
@@ -1,6 +1,6 @@
Name: libstroke
Version: 0.5.1
-Release: 12%{?dist}
+Release: 14%{?dist}
Summary: A stroke interface library
License: GPL
@@ -14,6 +14,8 @@
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
+Patch0: libstroke-aclocal.patch
+
%description
LibStroke is a stroke interface library. Strokes are motions
of the mouse that can be interpreted by a program as a command.
@@ -21,11 +23,12 @@
%package -n %{name}-devel
Summary: Development files for the libstroke library
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release} automake
%description -n %{name}-devel
Development files for the libstroke library.
+
%package -n libgstroke
Summary: Optional libgstroke files
Group: System Environment/Libraries
@@ -41,11 +44,12 @@
Summary: Development files for the libstroke library
Group: Development/Libraries
Requires: libgstroke = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release} automake
%description -n libgstroke-devel
Development files for the libgstroke library.
+
%package -n javastroke
Summary: Optional java files
Group: System Environment/Libraries
@@ -57,6 +61,8 @@
%prep
%setup -q
+%patch0 -p1 -b .aclocal
+
%build
%configure \
--disable-static \
@@ -65,35 +71,31 @@
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make INSTALL="%{__install} -p" install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}%{_datadir}/stroke/tests
mkdir -p %{buildroot}%{_datadir}/stroke/java
cp -p javastroke/*.java %{buildroot}%{_datadir}/stroke/java
-cp -p tests/stroke_test %{buildroot}%{_datadir}/stroke/tests
-cp -p tests/stroke_test.tcl %{buildroot}%{_datadir}/stroke/tests
-cp -p tests/gnome_stroke_test %{buildroot}%{_datadir}/stroke/tests
+
rm %{buildroot}%{_libdir}/*.la
%clean
rm -rf %{buildroot}
+
%files -n %{name}
%defattr(-,root,root)
%doc README COPYRIGHT ChangeLog NEWS AUTHORS TODO CREDITS
-%dir %{_datadir}/stroke/
-%dir %{_datadir}/stroke/tests/
%{_libdir}/libstroke.so.*
%files -n %{name}-devel
%defattr(-,root,root)
%doc doc/standard_strokes*
%{_datadir}/aclocal/libstroke.m4
-%{_datadir}/stroke/tests/stroke_test*
%{_libdir}/libstroke.so
%{_includedir}/stroke.h
+
%files -n libgstroke
%defattr(-,root,root)
%doc README COPYRIGHT ChangeLog NEWS AUTHORS TODO CREDITS
@@ -106,22 +108,29 @@
%files -n libgstroke-devel
%defattr(-,root,root)
%doc README.libgstroke
-%{_datadir}/stroke/tests/gnome_stroke_test
%{_datadir}/aclocal/libgstroke.m4
%{_libdir}/libgstroke.so
%{_includedir}/gstroke.h
+
%files -n javastroke
%defattr(-,root,root)
%doc javastroke/README
-%{_datadir}/stroke/java/
+%{_datadir}/stroke/
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+
%Changelog
-* Fri Sep 01 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.5.1-11
+* Thu Mar 01 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.5.1-14
+- patch for underquoted definitions #226886
+
+* Mon Feb 26 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.5.1-13
+- Fixed multilibs issues for rawhide
+
+* Fri Sep 01 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.5.1-12
- Removed automake as BR
* Fri Sep 01 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 0.5.1-11
More information about the fedora-extras-commits
mailing list