rpms/picviz/devel libpicviz-0.6-cmake.patch, NONE, 1.1 libpicviz-0.6-libdir.patch, NONE, 1.1 libpicviz-0.6-libev.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 picviz.spec, 1.6, 1.7 sources, 1.4, 1.5
Tomas Heinrich
theinric at fedoraproject.org
Thu Jul 23 13:47:13 UTC 2009
Author: theinric
Update of /cvs/extras/rpms/picviz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26379
Modified Files:
.cvsignore picviz.spec sources
Added Files:
libpicviz-0.6-cmake.patch libpicviz-0.6-libdir.patch
libpicviz-0.6-libev.patch
Log Message:
upgrade to 0.6
libpicviz-0.6-cmake.patch:
CMakeLists.txt | 4 ++--
gnulib/glthread/CMakeLists.txt | 2 +-
src/CMakeLists.txt | 18 +++++++++---------
src/plugins/output/CMakeLists.txt | 5 +++--
src/plugins/render/CMakeLists.txt | 4 ++--
src/plugins/vars/CMakeLists.txt | 4 ++--
6 files changed, 19 insertions(+), 18 deletions(-)
--- NEW FILE libpicviz-0.6-cmake.patch ---
diff -up libpicviz-0.6/CMakeLists.txt.orig libpicviz-0.6/CMakeLists.txt
--- libpicviz-0.6/CMakeLists.txt.orig 2009-07-21 19:46:44.000000000 +0200
+++ libpicviz-0.6/CMakeLists.txt 2009-07-21 19:46:44.000000000 +0200
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.6)
-project(LIBPICVIZ)
+project(libpicviz)
INCLUDE(CheckIncludeFile)
INCLUDE(CheckFunctionExists)
@@ -48,7 +48,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR
DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/ )
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LIBPICVIZ_SOURCE_DIR}/cmake)
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
FIND_PACKAGE(FLEX REQUIRED)
FIND_PACKAGE(BISON REQUIRED)
#FIND_PACKAGE(PCRE REQUIRED)
diff -up libpicviz-0.6/gnulib/glthread/CMakeLists.txt.orig libpicviz-0.6/gnulib/glthread/CMakeLists.txt
--- libpicviz-0.6/gnulib/glthread/CMakeLists.txt.orig 2009-07-21 19:46:44.000000000 +0200
+++ libpicviz-0.6/gnulib/glthread/CMakeLists.txt 2009-07-21 19:46:44.000000000 +0200
@@ -1,4 +1,4 @@
-include_directories(${LIBPICVIZ_SOURCE_DIR}/gnulib/ ${LIBPICVIZ_SOURCE_DIR})
+include_directories(${PROJECT_SOURCE_DIR}/gnulib/ ${PROJECT_SOURCE_DIR})
add_library(glthread STATIC cond.c lock.c thread.c threadlib.c tls.c)
diff -up libpicviz-0.6/src/CMakeLists.txt.orig libpicviz-0.6/src/CMakeLists.txt
--- libpicviz-0.6/src/CMakeLists.txt.orig 2009-07-21 19:46:44.000000000 +0200
+++ libpicviz-0.6/src/CMakeLists.txt 2009-07-21 19:46:44.000000000 +0200
@@ -1,14 +1,14 @@
add_subdirectory(plugins)
#add_subdirectory(bindings)
-include_directories(${LIBPICVIZ_SOURCE_DIR}/src/include ${PCRE_INCLUDE_DIR} ${LIBPICVIZ_SOURCE_DIR}/gnulib/glthread ${LIBPICVIZ_SOURCE_DIR}/libev)
+include_directories(${PROJECT_SOURCE_DIR}/src/include ${PCRE_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/gnulib/glthread ${PROJECT_SOURCE_DIR}/libev)
link_directories(
- ${LIBPICVIZ_BINARY_DIR}/libev
+ ${PROJECT_BINARY_DIR}/libev
)
#set(CMAKE_SHARED_LINKER_FLAGS "-lm -lfl -ly")
-#link_directories(${LIBPICVIZ_BINARY_DIR}/ ${LIBPICVIZ_BINARY_DIR}/gnulib/glthread ${LIBPICVIZ_BINARY_DIR}/libev)
+#link_directories(${PROJECT_BINARY_DIR}/ ${PROJECT_BINARY_DIR}/gnulib/glthread ${PROJECT_BINARY_DIR}/libev)
IF(PCRE_FOUND)
INCLUDE_DIRECTORIES(AFTER ${PCRE_INCLUDE_DIR})
@@ -17,19 +17,19 @@ ENDIF(PCRE_FOUND)
# Parser
-BISON_TARGET(picviz ${LIBPICVIZ_SOURCE_DIR}/src/pgdl-parser.y ${LIBPICVIZ_BINARY_DIR}/src/pgdl-parser.c)
-FLEX_TARGET(picviz ${LIBPICVIZ_SOURCE_DIR}/src/pgdl-lexer.l ${LIBPICVIZ_BINARY_DIR}/src/pgdl-lexer.c)
+BISON_TARGET(picviz ${PROJECT_SOURCE_DIR}/src/pgdl-parser.y ${PROJECT_BINARY_DIR}/src/pgdl-parser.c)
+FLEX_TARGET(picviz ${PROJECT_SOURCE_DIR}/src/pgdl-lexer.l ${PROJECT_BINARY_DIR}/src/pgdl-lexer.c)
# Filter
-BISON_TARGET(picviz ${LIBPICVIZ_SOURCE_DIR}/src/filter.yac.y ${LIBPICVIZ_BINARY_DIR}/src/filter-parser.c)
-FLEX_TARGET(picviz ${LIBPICVIZ_SOURCE_DIR}/src/filter.lex.l ${LIBPICVIZ_BINARY_DIR}/src/filter-lexer.c)
+BISON_TARGET(picviz ${PROJECT_SOURCE_DIR}/src/filter.yac.y ${PROJECT_BINARY_DIR}/src/filter-parser.c)
+FLEX_TARGET(picviz ${PROJECT_SOURCE_DIR}/src/filter.lex.l ${PROJECT_BINARY_DIR}/src/filter-lexer.c)
add_library(picviz SHARED axis.c axisplot.c correlation.c debug.c real-time.c filter.c image.c learn.c line.c plugins.c engine.c picviz-hash.c picviz-init.c picviz-pcre.c properties.c render.c values-mapping.c variable.c utils.c filter-parser.c filter-lexer.c pgdl-parser.c pgdl-lexer.c prop-color.c)
set_target_properties(picviz PROPERTIES SOVERSION 2)
-#target_link_libraries(picviz "-lm -ldl -L${LIBPICVIZ_BINARY_DIR}/libev -lev")
-target_link_libraries(picviz "-lm -ldl -L${LIBPICVIZ_BINARY_DIR}/libev/ -lev")
+#target_link_libraries(picviz "-lm -ldl -L${PROJECT_BINARY_DIR}/libev -lev")
+target_link_libraries(picviz "-lm -ldl -L${PROJECT_BINARY_DIR}/libev/ -lev")
install(TARGETS picviz LIBRARY DESTINATION ${LIB_INSTALL_DIR})
install(FILES
diff -up libpicviz-0.6/src/plugins/output/CMakeLists.txt.orig libpicviz-0.6/src/plugins/output/CMakeLists.txt
--- libpicviz-0.6/src/plugins/output/CMakeLists.txt.orig 2009-07-21 19:46:44.000000000 +0200
+++ libpicviz-0.6/src/plugins/output/CMakeLists.txt 2009-07-21 19:46:44.000000000 +0200
@@ -1,5 +1,6 @@
-include_directories(${LIBPICVIZ_SOURCE_DIR}/src/include)
-link_directories(${LIBPICVIZ_BUILD_DIR}/)
+include_directories(${PROJECT_SOURCE_DIR}/src/include)
+# not needed?
+#link_directories(${LIBPICVIZ_BUILD_DIR}/)
add_library(picvizoutsvg MODULE outsvg.c)
add_library(picvizoutdebug MODULE outdebug.c)
diff -up libpicviz-0.6/src/plugins/render/CMakeLists.txt.orig libpicviz-0.6/src/plugins/render/CMakeLists.txt
--- libpicviz-0.6/src/plugins/render/CMakeLists.txt.orig 2009-07-21 19:46:44.000000000 +0200
+++ libpicviz-0.6/src/plugins/render/CMakeLists.txt 2009-07-21 19:46:44.000000000 +0200
@@ -1,5 +1,5 @@
-include_directories(${LIBPICVIZ_SOURCE_DIR}/src/include)
-link_directories(${LIBPICVIZ_BUILD_DIR})
+include_directories(${PROJECT_SOURCE_DIR}/src/include)
+#link_directories(${LIBPICVIZ_BUILD_DIR})
# Debug plugin
#add_library(picvizrendebug MODULE rendebug.c)
diff -up libpicviz-0.6/src/plugins/vars/CMakeLists.txt.orig libpicviz-0.6/src/plugins/vars/CMakeLists.txt
--- libpicviz-0.6/src/plugins/vars/CMakeLists.txt.orig 2009-07-21 19:46:44.000000000 +0200
+++ libpicviz-0.6/src/plugins/vars/CMakeLists.txt 2009-07-21 19:46:44.000000000 +0200
@@ -1,5 +1,5 @@
- include_directories(${LIBPICVIZ_SOURCE_DIR}/src/include)
-link_directories(${LIBPICVIZ_BUILD_DIR})
+include_directories(${PROJECT_SOURCE_DIR}/src/include)
+#link_directories(${LIBPICVIZ_BUILD_DIR})
# Debug plugin
add_library(picvizvardebug MODULE vardebug.c)
libpicviz-0.6-libdir.patch:
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE libpicviz-0.6-libdir.patch ---
diff -up libpicviz-0.6/src/bindings/python/setup.py.orig libpicviz-0.6/src/bindings/python/setup.py
--- libpicviz-0.6/src/bindings/python/setup.py.orig 2009-07-20 17:06:20.000000000 +0200
+++ libpicviz-0.6/src/bindings/python/setup.py 2009-07-20 17:17:51.000000000 +0200
@@ -7,7 +7,7 @@ modulepcv = Extension('picviz',
('MINOR_VERSION', '6')],
include_dirs = ['../../include/'],
libraries = ['picviz','pcre'],
- library_dirs = ['../../../../build/src/libpicviz/'],
+ library_dirs = ['../../../build/src/'],
sources = ['py-picviz.c', 'py-picviz_util.c', 'py-picviz_image.c', 'py-picviz_axes.c', 'py-picviz_lines.c', 'py-picviz_pgdl.c'])
setup (name = 'Picviz',
libpicviz-0.6-libev.patch:
CMakeLists.txt | 2 +-
src/CMakeLists.txt | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE libpicviz-0.6-libev.patch ---
diff -up libpicviz-0.6/CMakeLists.txt.orig libpicviz-0.6/CMakeLists.txt
--- libpicviz-0.6/CMakeLists.txt.orig 2009-07-22 17:49:49.000000000 +0200
+++ libpicviz-0.6/CMakeLists.txt 2009-07-22 17:52:40.000000000 +0200
@@ -54,6 +54,7 @@ FIND_PACKAGE(BISON REQUIRED)
#FIND_PACKAGE(PCRE REQUIRED)
FIND_PACKAGE(PkgConfig)
+pkg_check_modules(LIBEV REQUIRED libev)
pkg_check_modules(Cairo cairo-png)
# Versions of GCC may have warnings I haven't
@@ -62,7 +63,6 @@ set(CMAKE_C_FLAGS "-Wall -Wextra -O0 -gg
#set(CMAKE_C_FLAGS_DEBUG "-Wall -Wextra -O0 -ggdb")
add_subdirectory(gnulib)
-add_subdirectory(libev)
add_subdirectory(src)
#SET_TARGET_PROPERTIES(picviz PROPERTIES LINKER_LANGUAGE C)
diff -up libpicviz-0.6/src/CMakeLists.txt.orig libpicviz-0.6/src/CMakeLists.txt
--- libpicviz-0.6/src/CMakeLists.txt.orig 2009-07-22 17:50:18.000000000 +0200
+++ libpicviz-0.6/src/CMakeLists.txt 2009-07-22 17:55:34.000000000 +0200
@@ -1,11 +1,11 @@
add_subdirectory(plugins)
#add_subdirectory(bindings)
-include_directories(${PROJECT_SOURCE_DIR}/src/include ${PCRE_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/gnulib/glthread ${PROJECT_SOURCE_DIR}/libev)
+include_directories(${PROJECT_SOURCE_DIR}/src/include ${PCRE_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/gnulib/glthread ${LIBEV_INCLUDE_DIRS})
link_directories(
- ${PROJECT_BINARY_DIR}/libev
+ ${LIBEV_LIBRARY_DIRS}
)
#set(CMAKE_SHARED_LINKER_FLAGS "-lm -lfl -ly")
#link_directories(${PROJECT_BINARY_DIR}/ ${PROJECT_BINARY_DIR}/gnulib/glthread ${PROJECT_BINARY_DIR}/libev)
@@ -29,7 +29,7 @@ add_library(picviz SHARED axis.c axisplo
set_target_properties(picviz PROPERTIES SOVERSION 2)
#target_link_libraries(picviz "-lm -ldl -L${PROJECT_BINARY_DIR}/libev -lev")
-target_link_libraries(picviz "-lm -ldl -L${PROJECT_BINARY_DIR}/libev/ -lev")
+target_link_libraries(picviz "-lm -ldl" ${LIBEV_LIBRARIES})
install(TARGETS picviz LIBRARY DESTINATION ${LIB_INSTALL_DIR})
install(FILES
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/picviz/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 18 Mar 2009 21:45:30 -0000 1.4
+++ .cvsignore 23 Jul 2009 13:47:12 -0000 1.5
@@ -1 +1,3 @@
-picviz-0.5.tar.gz
+libpicviz-0.6.tar.gz
+picviz-cli-0.6.tar.gz
+picviz-gui-0.6.tar.gz
Index: picviz.spec
===================================================================
RCS file: /cvs/extras/rpms/picviz/devel/picviz.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- picviz.spec 18 Mar 2009 21:45:30 -0000 1.6
+++ picviz.spec 23 Jul 2009 13:47:13 -0000 1.7
@@ -1,15 +1,21 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: picviz
-Version: 0.5
+Version: 0.6
Release: 1%{?dist}
Summary: Parallel coordinates plotter
License: GPLv3+
Group: Applications/Engineering
URL: http://www.wallinfire.net/picviz
-Source0: http://www.wallinfire.net/picviz/attachment/wiki/ReleasesDownload/%{name}-%{version}.tar.gz
-Source1: %{name}.desktop
+Source0: http://www.wallinfire.net/files/picviz/libpicviz-%{version}.tar.gz
+Source1: http://www.wallinfire.net/files/picviz/picviz-cli-%{version}.tar.gz
+Source2: http://www.wallinfire.net/files/picviz/picviz-gui-%{version}.tar.gz
+#Source3: http://www.wallinfire.net/files/picviz/picviz-parsers-%{version}.tar.gz
+Source4: %{name}.desktop
+Patch0: libpicviz-%{version}-libdir.patch
+Patch1: libpicviz-%{version}-cmake.patch
+Patch2: libpicviz-%{version}-libev.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
@@ -18,7 +24,7 @@ BuildRequires: flex
BuildRequires: python-devel
BuildRequires: pkgconfig
BuildRequires: pcre-devel
-BuildRequires: libevent-devel
+BuildRequires: libev-devel
Requires: pcre
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@@ -36,13 +42,6 @@ BuildRequires: desktop-file-utils
Requires: %{name} = %{version}-%{release}
Requires: PyQt4
-%package plugin-plplot
-Summary: Plplot plugin for picviz
-Group: Applications/Engineering
-BuildRequires: plplot-devel
-BuildRequires: libtool-ltdl-devel
-Requires: %{name} = %{version}-%{release}
-
%package plugin-pngcairo
Summary: PNG Cairo plugin for picviz
Group: Applications/Engineering
@@ -70,60 +69,81 @@ Header files for libpicviz.
%description gui
Graphical frontend for picviz.
-%description plugin-plplot
-Plugin for generating output using the plplot library.
-
%description plugin-pngcairo
Plugin for generating output using cairo-png.
%prep
-%setup -q
+%setup -q -c -a 1 -a 2
+%patch0 -p0 -b .libdir
+%patch1 -p0 -b .cmake
+%patch2 -p0 -b .libev
+
%build
+# libpicviz
+pushd libpicviz-%{version}
mkdir -p build
pushd build
%cmake -DCMAKE_SKIP_RPATH:BOOL=ON ..
make %{?_smp_mflags}
popd
-pushd src/libpicviz/bindings/python
+pushd src/bindings/python
python ./setup.py build
popd
+popd
+
+# cli
+pushd picviz-cli-%{version}
+pushd src
+gcc -g -I../../libpicviz-%{version}/src/include -o pcv pcv.c \
+ -L../../libpicviz-%{version}/build/src -lpicviz -lpcre
+popd
-pushd src/frontend
+mkdir -p build
+pushd build
+%cmake ../doc
+popd
+popd
+
+# gui
+pushd picviz-gui-%{version}
python ./setup.py build
popd
+
%install
rm -rf %{buildroot}
+
+# libpicviz
+pushd libpicviz-%{version}
make install DESTDIR=%{buildroot}
-pushd src/libpicviz/bindings/python
+pushd src/bindings/python
python ./setup.py install --root=%{buildroot} --install-lib=%{python_sitearch}
-popd
chmod 755 %{buildroot}/%{python_sitearch}/picviz.so
-
-pushd src/frontend
-python ./setup.py install --root=%{buildroot} --install-lib=%{python_sitearch}
+popd
popd
-install -d -m 755 %{buildroot}/%{_datadir}/%{name}
-install -d -m 755 %{buildroot}/%{_datadir}/%{name}/parsers
-install -p -m 755 parsers/*.pl %{buildroot}/%{_datadir}/%{name}/parsers
-install -d -m 755 %{buildroot}/%{_datadir}/%{name}/parsers/auth
-install -p -m 755 parsers/auth/ssh-auth2pcv.pl %{buildroot}/%{_datadir}/%{name}/parsers
-install -p -m 755 parsers/auth/ssh-opensession2pcv.pl %{buildroot}/%{_datadir}/%{name}/parsers
-install -d -m 755 %{buildroot}/%{_datadir}/%{name}/parsers/ids
-install -p -m 755 parsers/ids/* %{buildroot}/%{_datadir}/%{name}/parsers/ids
-install -d -m 755 %{buildroot}/%{_datadir}/%{name}/parsers/net
-install -p -m 755 parsers/net/* %{buildroot}/%{_datadir}/%{name}/parsers/net
-install -d -m 755 %{buildroot}/%{_datadir}/%{name}/parsers/scm
-install -p -m 755 parsers/scm/* %{buildroot}/%{_datadir}/%{name}/parsers/scm
-install -d -m 755 %{buildroot}/%{_datadir}/%{name}/parsers/web
-install -p -m 755 parsers/web/* %{buildroot}/%{_datadir}/%{name}/parsers/web
+# cli
+pushd picviz-cli-%{version}
+mkdir -p %{buildroot}/%{_bindir}
+install -p -m 755 src/pcv %{buildroot}/%{_bindir}/pcv
install -d -m 755 %{buildroot}/%{_datadir}/%{name}/templates
install -p -m 644 templates/*.pgdt %{buildroot}/%{_datadir}/%{name}/templates
-desktop-file-install --vendor="fedora" --dir=%{buildroot}/%{_datadir}/applications %{SOURCE1}
+
+pushd build
+make install DESTDIR=%{buildroot}
+popd
+popd
+
+# gui
+pushd picviz-gui-%{version}
+python ./setup.py install --root=%{buildroot} --install-lib=%{python_sitearch}
+popd
+
+desktop-file-install --vendor="fedora" --dir=%{buildroot}/%{_datadir}/applications %{SOURCE4}
+
%clean
rm -rf %{buildroot}
@@ -134,15 +154,14 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc COPYING README doc/* samples
+%doc libpicviz-%{version}/COPYING picviz-cli-%{version}/samples
%{_mandir}/man1/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}/
+
%{_libdir}/*.so.*
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.so
-%exclude %{_libdir}/%{name}/libpicvizoutplplot.so
-%exclude %{_libdir}/%{name}/libpicvizoutpngcairo.so
+%dir %{_libdir}/libpicviz
+%{_libdir}/libpicviz/*.so
+%exclude %{_libdir}/libpicviz/libpicvizoutpngcairo.so
%{python_sitearch}/picviz.so
%{python_sitearch}/Picviz*.egg-info
%{_bindir}/pcv
@@ -150,7 +169,7 @@ rm -rf %{buildroot}
%files devel
%defattr(-,root,root,-)
%{_libdir}/libpicviz.so
-%{_libdir}/pkgconfig/picviz.pc
+%{_libdir}/pkgconfig/libpicviz.pc
%{_includedir}/*
%files gui
@@ -161,15 +180,21 @@ rm -rf %{buildroot}
%{_bindir}/picviz-gui
%{_datadir}/applications/fedora-%{name}.desktop
-%files plugin-plplot
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/libpicvizoutplplot.so
-
%files plugin-pngcairo
%defattr(-,root,root,-)
-%{_libdir}/%{name}/libpicvizoutpngcairo.so
+%{_libdir}/libpicviz/libpicvizoutpngcairo.so
%changelog
+* Thu Jul 23 2009 Tomas Heinrich <theinric at redhat.com> 0.6-1
+- upgrade to 0.6
+ - upstream package has split into libpicviz, picviz-cli, picviz-gui,
+ picviz-parsers; pull them in to preserve current functionality,
+ but they should later go into their own packages
+ - drop plugin-plplot package as it is no longer supported,
+ remove BuildRequires: plplot-devel
+ - BuildRequires: libev-devel instead of libevent-devel
+ - several file paths changed
+
* Wed Mar 18 2009 Tomas Heinrich <theinric at redhat.com> 0.5-1
- upgrade
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/picviz/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 18 Mar 2009 21:45:30 -0000 1.4
+++ sources 23 Jul 2009 13:47:13 -0000 1.5
@@ -1 +1,3 @@
-b0f814e23e8eac186a752e9e52f382d0 picviz-0.5.tar.gz
+bd2cd1dd250dc5df362b1d3a5edea3cd libpicviz-0.6.tar.gz
+4ef5edbb77811de3ac608af28d02dce6 picviz-cli-0.6.tar.gz
+2517e16d3515d1e2865948cb221fdebb picviz-gui-0.6.tar.gz
More information about the fedora-extras-commits
mailing list