[llconf] Import
Petr Pisar
ppisar at fedoraproject.org
Tue Oct 9 07:18:01 UTC 2012
commit a9c8f6ea5d1b3862856a1faff1c4848950e077a8
Author: Petr Písař <ppisar at redhat.com>
Date: Tue Oct 9 09:17:06 2012 +0200
Import
.gitignore | 1 +
...Install-parsers-headers-into-subdirectory.patch | 22 +++++
llconf-0.4.6-Unify-paths-in-examples.patch | 66 ++++++++++++++
llconf.spec | 90 ++++++++++++++++++++
sources | 1 +
5 files changed, 180 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..aab2c57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/llconf-0.4.6.tar.gz
diff --git a/llconf-0.4.6-Install-parsers-headers-into-subdirectory.patch b/llconf-0.4.6-Install-parsers-headers-into-subdirectory.patch
new file mode 100644
index 0000000..bfc4530
--- /dev/null
+++ b/llconf-0.4.6-Install-parsers-headers-into-subdirectory.patch
@@ -0,0 +1,22 @@
+From 7f9f21b54831e1b3d8f9a41580e03364391672a0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Thu, 12 May 2011 17:51:45 +0200
+Subject: [PATCH] Install parsers headers into subdirectory
+
+---
+ src/parsers/Makefile.am | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/parsers/Makefile.am b/src/parsers/Makefile.am
+index 426b81b..0b11734 100644
+--- a/src/parsers/Makefile.am
++++ b/src/parsers/Makefile.am
+@@ -1,4 +1,5 @@
+ EXTRA_DIST=mkallmodules
++pkgincludedir=$(includedir)/$(PACKAGE)/parsers
+
+ pkginclude_HEADERS = file.h ifupdown.h \
+ pair.h ppp.h shell.h properties.h table.h ini.h tz.h pslave.h route.h iproute.h ipsec.h \
+--
+1.7.4.4
+
diff --git a/llconf-0.4.6-Unify-paths-in-examples.patch b/llconf-0.4.6-Unify-paths-in-examples.patch
new file mode 100644
index 0000000..7584ceb
--- /dev/null
+++ b/llconf-0.4.6-Unify-paths-in-examples.patch
@@ -0,0 +1,66 @@
+From 4bed63dd220bef62d25698d4f4dfbbb91df4372d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Thu, 12 May 2011 18:00:31 +0200
+Subject: [PATCH] Unify paths in examples
+
+---
+ examples/Makefile.am | 2 --
+ examples/example.c | 12 ++++++------
+ examples/wizard | 2 +-
+ 3 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index 0d14ca2..d83178e 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -1,11 +1,9 @@
+ EXTRA_DIST=wizard etc/hostname etc/hosts etc/interfaces etc/interfaces etc/resolv.conf
+
+-noinst_PROGRAMS=example
+
+ example_SOURCES= \
+ example.c
+
+-AM_CFLAGS = -I../src/ -I../src/parsers/
+
+ example_LDADD = ../src/libllconf.la
+
+diff --git a/examples/example.c b/examples/example.c
+index 63e1276..71cd980 100644
+--- a/examples/example.c
++++ b/examples/example.c
+@@ -26,12 +26,12 @@
+ #include <unistd.h>
+ #include <errno.h>
+
+-#include "strutils.h"
+-#include "nodes.h"
+-#include "lines.h"
+-#include "entry.h"
+-#include "modules.h"
+-#include "parsers/pslave.h"
++#include <llconf/strutils.h>
++#include <llconf/nodes.h>
++#include <llconf/lines.h>
++#include <llconf/entry.h>
++#include <llconf/modules.h>
++#include <llconf/parsers/pslave.h>
+
+ int main(int argc, char *argv[])
+ {
+diff --git a/examples/wizard b/examples/wizard
+index de9e597..14f5c1b 100755
+--- a/examples/wizard
++++ b/examples/wizard
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ # really need bash?
+
+-llconf=../src/llconf
++llconf=llconf
+ eni_file=./etc/interfaces
+ rsv_file=./etc/resolv.conf
+ hostname_file=./etc/hostname
+--
+1.7.4.4
+
diff --git a/llconf.spec b/llconf.spec
new file mode 100644
index 0000000..b7281cd
--- /dev/null
+++ b/llconf.spec
@@ -0,0 +1,90 @@
+Name: llconf
+Version: 0.4.6
+Release: 1%{?dist}
+Summary: Loss-less configuration file parser
+Group: Applications/File
+License: LGPLv2+
+URL: http://code.google.com/p/%{name}/
+Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: llconf-0.4.6-Install-parsers-headers-into-subdirectory.patch
+Patch1: llconf-0.4.6-Unify-paths-in-examples.patch
+BuildRequires: autoconf, automake, libtool
+BuildRequires: doxygen
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description
+llconf (loss-less configuration) tool is meant as a middle ware to unify
+control over configuration files. It tries to parse different
+configuration files using different modules, and rewrite them after
+applying changes, without destroying user changes and comments, so
+that it is still possible to edit the files with a common text editor.
+
+
+%package libs
+Summary: Loss-less configuration file parser library
+Group: System Environment/Libraries
+
+%description libs
+llconf (loss-less configuration) is meant as a middle ware to unify
+control over configuration files. It tries to parse different
+configuration files using different modules, and rewrite them after
+applying changes, without destroying user changes and comments, so
+that it is still possible to edit the files with a common text editor.
+
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+Libraries and header files needed for developing applications that use
+%{name}.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .parsers_headers
+%patch1 -p1 -b .unify_examples
+# Update libtool not to inject useless RPATH into resulting executable
+libtoolize -fi
+autoreconf
+chmod -x examples/wizard
+
+%build
+%configure --disable-static
+make %{?_smp_mflags}
+make -C doc doxygen
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+find "$RPM_BUILD_ROOT" -name '*.la' -exec rm -f {} +
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
+%files
+%doc examples/etc examples/wizard README.llconf
+%{_bindir}/*
+
+%files libs
+%doc COPYING README
+%{_libdir}/*.so.*
+
+%files devel
+%doc examples/example.c doc/html
+%{_includedir}/%{name}
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
+
+
+%changelog
+* Wed Apr 27 2011 Petr Pisar <ppisar at redhat.com> - 0.4.6-1
+- Version 0.4.6 packaged
+- Upgrade libtool to get rid of useless RPATH
+- Do not install libtool archives
+- Install additional documentation
+
diff --git a/sources b/sources
index e69de29..b8d515c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+cae6ef889905336913d0c8bfb5684e48 llconf-0.4.6.tar.gz
More information about the scm-commits
mailing list