rpms/libdockapp/devel libdockapp-0.6.1-stdinc_decl.patch, NONE, 1.1 libdockapp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Wed Jan 10 10:00:56 UTC 2007
Author: pertusus
Update of /cvs/extras/rpms/libdockapp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32550/devel
Modified Files:
.cvsignore sources
Added Files:
libdockapp-0.6.1-stdinc_decl.patch libdockapp.spec
Log Message:
auto-import libdockapp-0.6.1-2 on branch devel from libdockapp-0.6.1-2.src.rpm
libdockapp-0.6.1-stdinc_decl.patch:
--- NEW FILE libdockapp-0.6.1-stdinc_decl.patch ---
--- dockapp-0.6.1/src/dashaped.c.stdinc_decl 2007-01-09 17:38:37.000000000 +0100
+++ dockapp-0.6.1/src/dashaped.c 2007-01-09 17:39:04.000000000 +0100
@@ -22,6 +22,7 @@
*/
#include <assert.h>
+#include <string.h>
#include "dockapp.h"
#include "daargs.h"
--- dockapp-0.6.1/src/daargs.c.stdinc_decl 2005-07-16 13:49:10.000000000 +0200
+++ dockapp-0.6.1/src/daargs.c 2007-01-09 17:41:00.000000000 +0100
@@ -22,6 +22,8 @@
*/
#include <assert.h>
+#include <strings.h>
+#include <string.h>
#include "daargs.h"
#include "dautil.h"
@@ -38,6 +40,9 @@
static void _daContextAddOptions(DAProgramOption *options, int count);
static void printHelp(char *description);
+int contains(char *needle, char *haystack);
+int parseOption(DAProgramOption *option, int i, int argc, char** argv);
+int readIntOption(int index, char **argv);
/*
* Public functions
--- dockapp-0.6.1/src/dautil.c.stdinc_decl 2005-04-20 20:05:04.000000000 +0200
+++ dockapp-0.6.1/src/dautil.c 2007-01-09 17:37:02.000000000 +0100
@@ -21,6 +21,8 @@
* $Id: dautil.c,v 1.8 2005/04/20 18:05:04 dalroi Exp $
*/
+#include <string.h>
+
#include "daargs.h"
#include "dautil.h"
--- NEW FILE libdockapp.spec ---
%define _x11fontdir %{_datadir}/X11/fonts
Name: libdockapp
Version: 0.6.1
Release: 2%{?dist}
Summary: DockApp Development Standard Library
Group: System Environment/Libraries
License: MIT
URL: http://solfertje.student.utwente.nl/~dalroi/libdockapp/
Source0: http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/libdockapp-%{version}.tar.bz2
# add prototypes and includes
Patch0: libdockapp-0.6.1-stdinc_decl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXpm-devel libXext-devel libX11-devel
%description
LibDockApp is a library that provides a framework for developing dockapps.
It provides functions and structures to define and display command-line
options, create a dockable icon, handle events, etc.
The goal of the library is to provide a simple, yet clean interface and
standardize the ways in which dockapps are developed. A dockapp developed
using libDockApp will automatically behave well under most window
managers, and especially well under Window Maker.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: libXpm-devel
Requires: libX11-devel
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package fonts
Summary: Fonts provided with %{name}
Group: User Interface/X
Requires(post): chkfontpath
Requires(postun): chkfontpath
%description fonts
Bitmap X fonts provided with libdockapp.
%prep
%setup -q -n dockapp-%{version}
%patch0 -p1 -b .stdinc_decl
%build
%configure --disable-static --without-examples
# --disable-rpath doesn't work, doing as per the guidelines
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT XFONTDIR=$RPM_BUILD_ROOT%{_x11fontdir}
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
# fonts.alias is empty, so unusefull.
rm $RPM_BUILD_ROOT%{_x11fontdir}/dockapp/fonts.alias
rm -rf examples-devel
cp -a examples examples-devel
rm examples-devel/Makefile*
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%post fonts
/usr/sbin/chkfontpath -qa %{_datadir}/X11/fonts/dockapp
if [ -x /usr/bin/fc-cache ]; then
/usr/bin/fc-cache %{_datadir}/X11/fonts
fi
%postun -p /sbin/ldconfig
%postun fonts
if [ "$1" = "0" ]; then
if [ -x /usr/bin/fc-cache ]; then
/usr/bin/fc-cache %{_datadir}/X11/fonts
fi
/usr/sbin/chkfontpath -qr %{_datadir}/X11/fonts/dockapp
fi
%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING NEWS README
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
%doc examples-devel/*
%{_includedir}/*
%{_libdir}/*.so
%files fonts
# there is no obvious package to depend on that owns %{_datadir}/X11/fonts/
%{_x11fontdir}/
#%{_x11fontdir}/dockapp/
%changelog
* Wed Jan 10 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-2
- don't ship the empty fonts.alias
* Fri Jan 5 2007 Patrice Dumas <pertusus at free.fr> 0.6.1-1
- Initial release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libdockapp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 10 Jan 2007 09:59:42 -0000 1.1
+++ .cvsignore 10 Jan 2007 10:00:26 -0000 1.2
@@ -0,0 +1 @@
+libdockapp-0.6.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libdockapp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 10 Jan 2007 09:59:42 -0000 1.1
+++ sources 10 Jan 2007 10:00:26 -0000 1.2
@@ -0,0 +1 @@
+ec1219c355516d63b6e2ee1e4cb10c30 libdockapp-0.6.1.tar.bz2
More information about the scm-commits
mailing list