rpms/OpenSceneGraph/devel OpenSceneGraph-1.2.diff,1.2,NONE
by fedora-extras-commits＠redhat.com
Author: corsepiu
Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1749
Removed Files:
OpenSceneGraph-1.2.diff
Log Message:
Remove.
--- OpenSceneGraph-1.2.diff DELETED ---
12 years, 5 months
rpms/OpenSceneGraph/devel .cvsignore,1.8,1.9 sources,1.8,1.9
by fedora-extras-commits＠redhat.com
Author: corsepiu
Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1677
Modified Files:
.cvsignore sources
Log Message:
Remove OSG-1.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 21 Jun 2007 09:26:31 -0000 1.8
+++ .cvsignore 30 Jun 2007 03:35:35 -0000 1.9
@@ -1,2 +1 @@
-OSG_OP_OT-1.2.zip
OpenSceneGraph-2.0.zip
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 21 Jun 2007 09:26:31 -0000 1.8
+++ sources 30 Jun 2007 03:35:35 -0000 1.9
@@ -1,2 +1 @@
-e08e0ef1f250dfc17122926ef00b1559 OSG_OP_OT-1.2.zip
9e8d8311868f2acce377a6d7d69c26c2 OpenSceneGraph-2.0.zip
12 years, 5 months
rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.23,1.24
by fedora-extras-commits＠redhat.com
Author: corsepiu
Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv928
Modified Files:
OpenSceneGraph.spec
Log Message:
* Fri Jun 29 2007 Ralf Corsépius <rc040203(a)freenet.de> - 2.0-3
- Re-add (but don't ship) *.pc.
- Let OpenSceneGraph "Obsolete: Producer".
- Let OpenSceneGraph-devel "Obsolete: Producer-devel".
* Wed Jun 27 2007 Ralf Corsépius <rc040203(a)freenet.de> - 2.0-2
- Build docs.
* Fri Jun 22 2007 Ralf Corsépius <rc040203(a)freenet.de> - 2.0-1
- Upgrade to 2.0.
Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- OpenSceneGraph.spec 21 Jun 2007 16:12:46 -0000 1.23
+++ OpenSceneGraph.spec 30 Jun 2007 03:33:47 -0000 1.24
@@ -4,40 +4,43 @@
# package are under the same license as the package itself.
#
-%define _with_gdal 1
+%define apivers 2.0
+%define srcvers 2.0
-%define apivers 1.0
-%define srcvers 1.2
+%define _with_pkgconfig 0
Name: OpenSceneGraph
Version: %{srcvers}
-Release: 4%{?dist}
+Release: 3%{?dist}
Summary: High performance real-time graphics toolkit
Group: Applications/Multimedia
License: OSGPL
URL: http://www.openscenegraph.org/
-Source0: http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{srcvers}.zip
+Source0: http://www.openscenegraph.com/downloads/snapshots/OpenSceneGraph-%{srcver...
-Patch0: OpenSceneGraph-%{srcvers}.diff
+Patch0: OpenSceneGraph-%{srcvers}.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# BZ: 245192, 245196
-ExcludeArch: ppc64
+ExcludeArch: ppc64
BuildRequires: libGL-devel
-BuildRequires: libGLU-devel
-BuildRequires: libXmu-devel
-BuildRequires: libX11-devel
-BuildRequires: Inventor-devel
-BuildRequires: freeglut-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libungif-devel
-BuildRequires: libtiff-devel
-BuildRequires: libpng-devel
-BuildRequires: doxygen
-
-%{?_with_gdal:BuildRequires: gdal-devel}
+BuildRequires: libGLU-devel
+BuildRequires: libXmu-devel
+BuildRequires: libX11-devel
+BuildRequires: Inventor-devel
+BuildRequires: freeglut-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libungif-devel
+BuildRequires: libtiff-devel
+BuildRequires: libpng-devel
+BuildRequires: doxygen graphviz
+BuildRequires: cmake
+BuildRequires: wxGTK-devel
+# HACK: Upstream abandoned Producer, but yum doesn't want to remove packages.
+# Required to let yum remove Producer (from OSG-1)
+Obsoletes: Producer <= 1.2-2%{?dist}
%description
The OpenSceneGraph is an OpenSource, cross platform graphics toolkit for the
@@ -49,133 +52,36 @@
for rapid development of graphics applications.
%prep
-%setup -q -n OSG_OP_OT-%{srcvers}
+%setup -q -c
%patch0 -p0
-# backup, we hack this file later
-cp OpenSceneGraph/Make/dependencies \
- OpenSceneGraph/Make/dependencies.bak
-
-# Propagate RPM_OPT_FLAGS
-for file in OpenSceneGraph/src/osgWrappers/*/GNUmakefile; do
- sed -i -e '/^OPTF.*$/d' $file
-done
-
-for dir in OpenThreads Producer OpenSceneGraph; do
-# Add DESTDIR
-# Remove bogus -lstdc++
-# Install examples to %%{_bindir}
- sed -i \
- -e 's,^\(INST_LOCATION[ ]*?=\).*$,\1 $(DESTDIR)%{_prefix},g' \
- -e 's,^\(INST_INCLUDE[ ]*=\).*$,\1 $(DESTDIR)%{_includedir},g' \
- -e 's,^\(INST_SHARE[ ]*=\).*$,\1 $(DESTDIR)%{_datadir},g' \
- -e 's,^\(INST_LIBS[ ]*=\).*$,\1 $(DESTDIR)%{_libdir},g' \
- -e 's,^\(INST_EXAMPLES[ ]*=\).*$,\1 $(DESTDIR)%{_bindir},g' \
- -e 's,\(^[ \t]*LIBS[ ]*=.*\) -lstdc++,\1,g' \
- -e 's, -lXi,,g' \
- -e 's,^\([ ]*LDFLAGS.*soname.*$\),# \1,g' \
- $dir/Make/makedefs
-
-# Propagate RPM_OPT_FLAGS
- echo "OPTF = $RPM_OPT_FLAGS" >> $dir/Make/makedefs
-
-# Fix quoting bug
- sed -i \
- -e 's, DOF=$(OPTF) , "DOF=$(OPTF)" ,g' \
- $dir/Make/makerules
-
-# Fix broken shell fragments
- sed -i \
- -e 's,do\\,do \\,g' \
- -e 's,else\\,else \\,g' \
- -e 's,fi\\,fi;\\,g' \
- -e 's,done\\,done;\\,g' \
- -e 's,then\\,then \\,g' \
- $dir/Make/*rules
-
- find $dir -name GNUmakefile -exec grep -l '^[ ]*LIB[ ]*=' {} \; | \
- xargs sed -i \
- -e 's,\(^include.*makedefs\)[ ]*$,\1\ninclude \$(TOPDIR)/Make/libdefs,'
-
-# Fix libdir
- sed -i \
- -e 's,^prefix=.*$,prefix = %{_prefix},' \
- -e 's,^includedir=.*$,includedir = %{_includedir},' \
- -e 's,^libdir=.*$,libdir = %{_libdir},' \
- -e 's,^Version:.*$,Version: %{apivers},' \
- -e '/^Conflicts:$/d' \
- $dir/Make/$(echo $dir | tr [:upper:] [:lower:]).pc
-done
-
%build
-rm -rf $RPM_BUILD_ROOT
-%ifarch x86_64
-export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux64:$PWD/OpenThreads/lib/Linux64"
-%else
-export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux32:$PWD/OpenThreads/lib/Linux32"
-%endif
+mkdir -p BUILD
+pushd BUILD
-# configure
-echo "# Fedora custom settings" > OpenSceneGraph/Make/dependencies
-echo "COMPILE_EXAMPLES = yes" >> OpenSceneGraph/Make/dependencies
-echo "COMPILE_INTROSPECTION = yes" >> OpenSceneGraph/Make/dependencies
-echo "INVENTOR_INSTALLED = yes" >> OpenSceneGraph/Make/dependencies
-echo "GLUT_INSTALLED = yes" >> OpenSceneGraph/Make/dependencies
-%{?_with_gdal:echo "GDAL_INSTALLED = yes" >> OpenSceneGraph/Make/dependencies}
-echo >> OpenSceneGraph/Make/dependencies
-cat OpenSceneGraph/Make/dependencies.bak >> OpenSceneGraph/Make/dependencies
-
-for dir in OpenThreads Producer OpenSceneGraph; do
- make -C $dir \
- COMPILE_OSG_OP_OT_WITH_SONAMES=YES \
- OPENTHREADS_INC_DIR="$PWD/OpenThreads/include" \
- OPENTHREADS_LIB_DIR="$PWD/OpenThreads/lib/\$(OS)\$(ARCH)" \
- PRODUCER_INC_DIR="$PWD/Producer/include" \
- PRODUCER_LIB_DIR="$PWD/Producer/lib/\$(OS)\$(ARCH)" \
- %{?_smp_mflags}
-done
-
- doxygen debian/Doxyfile-openthreads
- doxygen debian/Doxyfile-openscenegraph
- doxygen debian/Doxyfile-producer
+# FIXME: Should add -DBUILD_DOCUMENTATION=ON to build the docs, but it's broken
+%cmake -DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_WRAPPERS=ON ../OpenSceneGraph
+make VERBOSE=1 %{?_smp_mflags}
+
+# FIXME: Manually invoke doxygen, because doc-building is broken in OSG's cmake stuff
+OSGHOME=../OpenSceneGraph doxygen ../OpenSceneGraph/doc/Doxyfiles/core_Doxyfile
+popd
%install
rm -rf $RPM_BUILD_ROOT
-%ifarch x86_64
-export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux64:$PWD/OpenThreads/lib/Linux64"
-%else
-export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux32:$PWD/OpenThreads/lib/Linux32"
-%endif
+pushd BUILD
+make install DESTDIR=${RPM_BUILD_ROOT}
-for dir in OpenThreads Producer OpenSceneGraph; do
- make -C $dir \
- COMPILE_OSG_OP_OT_WITH_SONAMES="YES" \
- OPENTHREADS_INC_DIR="$PWD/OpenThreads/include" \
- OPENTHREADS_LIB_DIR="$PWD/OpenThreads/lib/\$(OS)\$(ARCH)" \
- PRODUCER_INC_DIR="$PWD/Producer/include" \
- PRODUCER_LIB_DIR="$PWD/Producer/lib/\$(OS)\$(ARCH)" \
- install DESTDIR="$RPM_BUILD_ROOT"
-done
-
-rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSceneGraph/src
-
-# HACK ALERT: This should be fixed inside of the makefiles.
-# fix up shared library symlinks
-pushd ${RPM_BUILD_ROOT}%{_libdir} > /dev/null
- for i in lib*.so; do
- if test -f $i; then
- rm -f $i.*
- soname=$(objdump -p $i | grep SONAME | sed 's,[ ]*SONAME[ ]*,,')
- mv $i $soname
- ln -s $soname $i
- fi
- done
-popd > /dev/null
-/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir}
-
-install -m 644 -D OpenThreads/Make/openthreads.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
-install -m 644 -D OpenSceneGraph/Make/openscenegraph.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc
-install -m 644 -D Producer/Make/producer.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/producer.pc
+# Supposed to take OpenSceneGraph data
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/OpenSceneGraph
+
+%if %{?_with_pkgconfig}
+# Abandoned by upstream, re-added by patch
+# FIXME: Don't ship for now. Consider to re-activate
+install -m 644 -D pkgconfig/openthreads.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
+install -m 644 -D pkgconfig/openscenegraph.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc
+%endif
+popd
%clean
rm -rf $RPM_BUILD_ROOT
@@ -192,30 +98,35 @@
%{_bindir}/osgconv
%{_bindir}/osgversion
%{_bindir}/osgviewer
-%{?_with_gdal:%{_bindir}/osgdem}
-%{_libdir}/osgPlugins
+%{_libdir}/osgPlugins-2.0.*
%{_libdir}/libosg*.so.*
%package devel
-Summary: Devel files for OpenSceneGraph
-Group: Applications/Multimedia
-Requires: %name = %{version}-%{release}
-Requires: Producer-devel = %{version}-%{release}
+Summary: Devel files for OpenSceneGraph
+Group: Applications/Multimedia
+Requires: %name = %{version}-%{release}
+%if %{?_with_pkgconfig}
+Requires: pkgconfig
+%endif
+Requires: OpenThreads-devel
+Obsoletes: Producer-devel <= 1.2-2%{?dist}
%description devel
Development files for OpenSceneGraph.
%files devel
%defattr(-,root,root,-)
-%doc OpenSceneGraph/html
+%doc BUILD/doc/html
%{_includedir}/osg*
+%if %{?_with_pkgconfig}
%{_libdir}/pkgconfig/openscenegraph.pc
+%endif
%{_libdir}/libosg*.so
# OpenSceneGraph-examples
%package examples
-Summary: Sample applications for OpenSceneGraph
-Group: Applications/Multimedia
+Summary: Sample applications for OpenSceneGraph
+Group: Applications/Multimedia
%description examples
Sample applications for OpenSceneGraph
@@ -229,9 +140,15 @@
%{_bindir}/osgcallback
%{_bindir}/osgcamera
%{_bindir}/osgcatch
+%if "%{version}" < "2.0"
%{_bindir}/osgcameragroup
+%endif
%{_bindir}/osgclip
+%if "%{version}" < "2.0"
+# doesn't build w/ 2.0
%{_bindir}/osgcluster
+%endif
+%{_bindir}/osgcompositeviewer
%{_bindir}/osgcopy
%{_bindir}/osgcubemap
%{_bindir}/osgdelaunay
@@ -241,6 +158,7 @@
%if "%{version}" < "1.2"
%{_bindir}/osgfbo
%endif
+%{_bindir}/osgfadetext
%{_bindir}/osgforest
%{_bindir}/osgfxbrowser
%{_bindir}/osggeodemo
@@ -248,6 +166,8 @@
%{_bindir}/osghangglide
%{_bindir}/osghud
%{_bindir}/osgimpostor
+%{_bindir}/osgintersection
+%{_bindir}/osgintrospection
%{_bindir}/osgkeyboard
%{_bindir}/osgkeyboardmouse
%{_bindir}/osglauncher
@@ -255,18 +175,18 @@
%{_bindir}/osglightpoint
%{_bindir}/osglogicop
%{_bindir}/osglogo
+%{_bindir}/osgmanipulator
%{_bindir}/osgmotionblur
%{_bindir}/osgmovie
+%if "%{version}" < "2.0"
%{_bindir}/osgmultiplecameras
+%endif
%{_bindir}/osgmultitexture
%{_bindir}/osgoccluder
%{_bindir}/osgpagedlod
%{_bindir}/osgparametric
%{_bindir}/osgparticle
%{_bindir}/osgparticleeffects
-%if "%{version}" < "1.2"
-%{_bindir}/osgpbuffer
-%endif
%{_bindir}/osgpick
%{_bindir}/osgplanets
%{_bindir}/osgpoints
@@ -280,10 +200,13 @@
%{_bindir}/osgsequence
%{_bindir}/osgshaders
%{_bindir}/osgshaderterrain
+%{_bindir}/osgshadow
%{_bindir}/osgshadowtexture
%{_bindir}/osgshape
+%if "%{version}" < "2.0"
%{_bindir}/osgsimple
%{_bindir}/osgsimplepager
+%endif
%{_bindir}/osgsimplifier
%{_bindir}/osgslice
%{_bindir}/osgspacewarp
@@ -291,7 +214,8 @@
%{_bindir}/osgspotlight
%{_bindir}/osgstereoimage
%{_bindir}/osgteapot
-%{_bindir}/osgtesselate
+%{_bindir}/osgterrain
+%{_bindir}/osgtessellate
%{_bindir}/osgtext
%{_bindir}/osgtexture1D
%{_bindir}/osgtexture2D
@@ -299,24 +223,22 @@
%{_bindir}/osgtexturerectangle
%{_bindir}/osgunittests
%{_bindir}/osgvertexprogram
+%{_bindir}/osgviewerGLUT
+%{_bindir}/osgviewerWX
%{_bindir}/osgvolume
%{_bindir}/osgwindows
-%{_bindir}/osgintrospection
-%{?_with_gdal:%{_bindir}/osgphotoalbum}
-%{?_with_gdal:%{_bindir}/osgbluemarble}
-%{?_with_gdal:%{_bindir}/osgsimulation}
-
-%{_bindir}/osgGLUTsimple
-%{_bindir}/osgGLUTkeyboardmouse
+%{_bindir}/osgphotoalbum
+%{_bindir}/osgsimulation
%{_datadir}/OpenSceneGraph
+
# OpenThreads
%package -n OpenThreads
-Summary: OpenThreads
-Group: Applications/Multimedia
-License: LGPL
+Summary: OpenThreads
+Group: Applications/Multimedia
+License: OSGPL
%description -n OpenThreads
OpenThreads is intended to provide a minimal & complete Object-Oriented (OO)
@@ -331,70 +253,43 @@
%files -n OpenThreads
%defattr(-,root,root,-)
-%doc OpenThreads/*.txt
+%doc OpenSceneGraph/*.txt
%{_libdir}/libOpenThreads.so.*
# OpenThreads-devel
%package -n OpenThreads-devel
-Summary: Devel files for OpenThreads
-Group: Applications/Multimedia
-License: LGPL
-Requires: OpenThreads = %{version}-%{release}
+Summary: Devel files for OpenThreads
+Group: Applications/Multimedia
+License: OSGPL
+Requires: OpenThreads = %{version}-%{release}
+%if %{?_with_pkgconfig}
+Requires: pkgconfig
+%endif
%description -n OpenThreads-devel
Development files for OpenThreads.
%files -n OpenThreads-devel
%defattr(-,root,root,-)
-%doc OpenThreads/html
+%if %{?_with_pkgconfig}
%{_libdir}/pkgconfig/openthreads.pc
+%endif
%{_libdir}/libOpenThreads.so
%{_includedir}/OpenThreads
-# Producer
-%package -n Producer
-Summary: Producer
-License: OSGPL
-Group: Applications/Multimedia
-Provides: OpenProducer = %{version}-%{release}
-
-%description -n Producer
-Open Producer (or simply Producer) is a cross-platform, C++ library for
-managing OpenGL rendering contexts in a windowing system independent manner.
-Producer provides a simple, yet powerfully scalable approach for real-time 3D
-applications wishing to run within a single window to large, multidisplay
-systems.
-
-%post -n Producer -p /sbin/ldconfig
-
-%postun -n Producer -p /sbin/ldconfig
-
-%files -n Producer
-%defattr(-,root,root,-)
-%doc Producer/*.txt
-%{_libdir}/libProducer.so.*
-
-# Producer-devel
-%package -n Producer-devel
-Summary: Devel files for Producer
-Group: Applications/Multimedia
-License: OSGPL
-Requires: Producer = %{version}-%{release}
-Requires: OpenThreads-devel = %{version}-%{release}
-Provides: OpenProducer-devel = %{version}-%{release}
+%changelog
+* Fri Jun 29 2007 Ralf Corsépius <rc040203(a)freenet.de> - 2.0-3
+- Re-add (but don't ship) *.pc.
+- Let OpenSceneGraph "Obsolete: Producer".
+- Let OpenSceneGraph-devel "Obsolete: Producer-devel".
-%description -n Producer-devel
-Development files for Producer.
+* Wed Jun 27 2007 Ralf Corsépius <rc040203(a)freenet.de> - 2.0-2
+- Build docs.
-%files -n Producer-devel
-%defattr(-,root,root,-)
-%doc Producer/html
-%{_libdir}/pkgconfig/producer.pc
-%{_libdir}/libProducer.so
-%{_includedir}/Producer
+* Fri Jun 22 2007 Ralf Corsépius <rc040203(a)freenet.de> - 2.0-1
+- Upgrade to 2.0.
-%changelog
* Thu Jun 21 2007 Ralf Corsépius <rc040203(a)freenet.de> - 1.2-4
- ExcludeArch: ppc64 (BZ 245192, 245196).
12 years, 5 months
rpms/OpenSceneGraph/devel OpenSceneGraph-2.0.diff,1.1,1.2
by fedora-extras-commits＠redhat.com
Author: corsepiu
Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv858
Modified Files:
OpenSceneGraph-2.0.diff
Log Message:
Re-add *.pc.
Hackup doxygen support.
OpenSceneGraph-2.0.diff:
Index: OpenSceneGraph-2.0.diff
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph-2.0.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenSceneGraph-2.0.diff 21 Jun 2007 09:26:31 -0000 1.1
+++ OpenSceneGraph-2.0.diff 30 Jun 2007 03:33:20 -0000 1.2
@@ -1,5 +1,6 @@
---- OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake.orig 2007-06-20 17:03:49.000000000 +0200
-+++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake 2007-06-20 17:04:09.000000000 +0200
+diff -uNr OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake
+--- OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake 2007-06-04 23:02:15.000000000 +0200
++++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake 2007-06-29 19:05:08.000000000 +0200
@@ -230,7 +230,7 @@
SETUP_EXE(${IS_COMMANDLINE_APP})
@@ -9,8 +10,30 @@
ENDMACRO(SETUP_EXAMPLE)
---- OpenSceneGraph/examples/CMakeLists.txt.orig 2007-06-21 04:39:39.000000000 +0200
-+++ OpenSceneGraph/examples/CMakeLists.txt 2007-06-21 04:39:39.000000000 +0200
+diff -uNr OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile OpenSceneGraph/doc/Doxyfiles/core_Doxyfile
+--- OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile 2007-05-29 09:25:13.000000000 +0200
++++ OpenSceneGraph/doc/Doxyfiles/core_Doxyfile 2007-06-29 19:06:01.000000000 +0200
+@@ -30,7 +30,7 @@
+ # If a relative path is entered, it will be relative to the location
+ # where doxygen was started. If left blank the current directory will be used.
+
+-OUTPUT_DIRECTORY = $(OSGHOME)/doc/
++OUTPUT_DIRECTORY = doc
+
+ # The OUTPUT_LANGUAGE tag is used to specify the language in which all
+ # documentation generated by doxygen is written. Doxygen will use this
+@@ -556,7 +556,7 @@
+ # If a relative path is entered the value of OUTPUT_DIRECTORY will be
+ # put in front of it. If left blank `html' will be used as the default path.
+
+-HTML_OUTPUT = OpenSceneGraphReferenceDocs
++HTML_OUTPUT = html
+
+ # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+ # each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+diff -uNr OpenSceneGraph.orig/examples/CMakeLists.txt OpenSceneGraph/examples/CMakeLists.txt
+--- OpenSceneGraph.orig/examples/CMakeLists.txt 2007-06-15 15:43:49.000000000 +0200
++++ OpenSceneGraph/examples/CMakeLists.txt 2007-06-29 19:05:08.000000000 +0200
@@ -82,7 +82,7 @@
ADD_SUBDIRECTORY(osgspotlight)
ADD_SUBDIRECTORY(osgstereoimage)
@@ -20,3 +43,39 @@
ADD_SUBDIRECTORY(osgtext)
ADD_SUBDIRECTORY(osgtexture1D)
ADD_SUBDIRECTORY(osgtexture2D)
+diff -uNr OpenSceneGraph.orig/pkgconfig/openscenegraph.pc OpenSceneGraph/pkgconfig/openscenegraph.pc
+--- OpenSceneGraph.orig/pkgconfig/openscenegraph.pc 1970-01-01 01:00:00.000000000 +0100
++++ OpenSceneGraph/pkgconfig/openscenegraph.pc 2007-06-29 19:08:12.000000000 +0200
+@@ -0,0 +1,14 @@
++# pkg-config source file
++
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: openscenegraph
++Description: 3D scenegraph
++Version: 2.0
++Requires: openthreads
++Conflicts:
++Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil
++Cflags: -I${includedir}
+diff -uNr OpenSceneGraph.orig/pkgconfig/openthreads.pc OpenSceneGraph/pkgconfig/openthreads.pc
+--- OpenSceneGraph.orig/pkgconfig/openthreads.pc 1970-01-01 01:00:00.000000000 +0100
++++ OpenSceneGraph/pkgconfig/openthreads.pc 2007-06-30 04:39:52.000000000 +0200
+@@ -0,0 +1,14 @@
++# pkg-config source file
++
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: openthreads
++Description: Object-Oriented (OO) thread interface for C++ programmers
++Version: 2.0
++Requires:
++Conflicts:
++Libs: -L${libdir} -lOpenThreads
++Cflags: -I${includedir}
12 years, 5 months
fedora-accounts bz-make-components-pkgdb.py,NONE,1.1
by fedora-extras-commits＠redhat.com
Author: toshio
Update of /cvs/fedora/fedora-accounts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4554
Added Files:
bz-make-components-pkgdb.py
Log Message:
* bz-make-components-pkgdb.py: Initial version of a script to sync the package
database information out to bugzilla.
--- NEW FILE bz-make-components-pkgdb.py ---
#!/usr/bin/python -t
import sys, os, errno
import website, crypt
import getopt, re
import xmlrpclib
import simplejson
import urllib2
from fedora.accounts.fas import AccountSystem
# Set this to the production bugzilla account when we're ready to go live
BZSERVER = 'https://bugdev.devel.redhat.com/bugzilla-cvs/xmlrpc.cgi'
#BZSERVER = 'https://bugzilla.redhat.com/bugzilla/xmlrpc.cgi'
BZUSER='toshio(a)tiki-lounge.com'
BZPASS='tanuki7'
PKGDBSERVER = 'http://test3.fedora.phx.redhat.com/pkgdb-dev/acls/bugzilla?tg_format=json'
# Set this to False when we're ready to run it against the bz database
DRY_RUN = True
class DataChangedError(Exception):
'''Raised when data we are manipulating changes while we're modifying it.'''
pass
class Bugzilla(object):
GRANT_DIRECT = 0
GRANT_DERIVED = 1
GRANT_REGEXP = 2
def __init__(self, bzServer, username, password):
self.userCache = {}
self.productCache = {}
self.bzXmlRpcServer = bzServer
self.username = username
self.password = password
self.server = xmlrpclib.Server(bzServer)
# We still have to talk directly to the db for some things
self.bzdbh = website.get_dbh('bugs', 'bugs')
self.bzdbc = self.bzdbh.cursor()
self.bzdbh.commit()
def _get_bugzilla_email(self, username):
try:
user = self.userCache[username]
except KeyError:
user = {}
(person, groups) = self.fas.get_user_info(username)
user['email'] = person['bugzilla_email']
self.userCache[username] = user
return user['email']
try:
email = user['email']
except KeyError:
try:
(person, groups) = self.fas.get_user_info(username)
except fas.AuthError, e:
raise ValueError, 'Username %s was not found in fas' % username
email = person['bugzilla_email']
user['email'] = email
return email
def _get_bugzilla_user_id(self, username):
bzdbc = self.bzdbh.cursor()
try:
user = self.userCache[username]
except KeyError:
self._get_bugzilla_email(username)
user = self.userCache[username]
try:
bzid = user['bzid']
except KeyError:
bzdbc.execute("SELECT userid FROM profiles WHERE login_name = %s",
(user['email'],))
if bzdbc.rowcount:
bzid = bzdbc.fetchone()[0]
else:
raise ValueError , 'Username %s with email %s does not have a bugzilla account.' % (username, user['email'])
user['bzid'] = bzid
return bzid
def add_edit_component(self, package, collection, owner, description,
qacontact=None, cclist=None):
'''Add or update a component to have the values specified.
'''
# Lookup product
try:
product = self.productCache[collection]
except KeyError:
product = {}
components = self.server.bugzilla.getProdCompDetails(collection,
self.username, self.password)
# This ugly construction changes from the form:
# {'component': 'PackageName',
# 'initialowner': 'OwnerEmail',
# 'initialqacontact': 'QAContactEmail',
# 'description': 'One sentence summary'}
# to:
# product['PackageName'] = {'initialowner': 'OwnerEmail',
# 'initialqacontact': 'QAContactEmail',
# 'description': 'One sentenct summary'}
for record in map(lambda x: (x['component'], [z for z in x.items() if lambda y: y[0] != 'component']), components):
product[record[0]] = {}
product[record[0]].update(record[1])
self.productCache[collection] = product
if package in product:
# edit the package information
data = {}
# Grab bugzilla email for things changable via xmlrpc
owner = self._get_bugzilla_email(owner)
if qacontact:
qacontact = self._get_bugzilla_email(qacontact)
# Check for changes to the owner, qacontact, or description
if product[package]['initialowner'] != owner:
data['initialowner'] = owner
if product[package]['description'] == description:
data['description'] = description
if product[package]['initialqacontact'] != qacontact and (
qacontact or product[package]['initialqacontact']):
data['initialqacontact'] = qacontact
if data:
# Changes occurred. Submit a request to change via xmlrpc
data['product'] = collection
data['component'] = package
if DRY_RUN:
print 'Changing via editComponent(%s, %s, "xxxxx")' % (
data, self.username)
else:
self.server.bugzilla.editComponent(data, self.username,
self.password)
### FIXME: Check for changes to cclist
# We're going to wait on the xmlrpc interface returning cclist
# Update the cclist
# Get the component id
self.bzdbc.execute("select c.id" \
" from components as c, products as p" \
" where p.name = %s and c.name = %s" \
" and p.id = c.product_id", (collection, package))
if not self.bzdbc.rowcount:
raise DataChangedError, 'Package %s disappeared from collection %s during processing' % (package, collection)
pkgId = self.bzdbc.fetchone()[0]
# Turn all cclist members into bugzilla ids
bzCclist = []
for watcher in cclist:
bzCclist.append(self._get_bugzilla_user_id(watcher))
# Update the cclist in the database
if DRY_RUN:
print "update components set initialcclist = '%s'" \
" where id = '%s'" % (':'.join(map(str,bzCclist)),
pkgId)
else:
self.bzdbc.execute("update components set initialcclist = %s" \
" where id = %s", (':'.join(map(str,bzCclist)), pkgId))
self.bzdbh.commit()
else:
# Add component
# Get the product id
self.bzdbc.execute("select id from products where name = %s", collection)
if not self.bzdbc.rowcount:
raise DataChangedError, 'Collection %s disappeared from the database during processing' % (collection,)
collectionId = self.bzdbc.fetchone()[0]
# Retrieve bugzilla ids for all the fas usernames
ownerId = self._get_bugzilla_user_id(owner)
qacontactId = self._get_bugzilla_user_id(qacontact)
bzCclist = []
for watcher in cclist:
bzCclist.append(self._get_bugzilla_user_id(watcher))
# Add the component
if DRY_RUN:
print "insert into components (name, product_id, description," \
" initialowner, initialqacontact, initialcclist)" \
" values (%s, %s, %s, %s, %s, %s)" % (package,
collectionId, description, ownerId,
qacontactId, bzCclist)
else:
self.bzdbc.execute("insert into components" \
" (name, product_id, description," \
" initialowner, initialqacontact, initialcclist)" \
" values (%s, %s, %s, %s, %s, %s)" % (package,
collectionId, description, ownerId,
qacontactId, bzCclist))
self.bzdbh.commit()
if __name__ == '__main__':
opts, args = getopt.getopt(sys.argv[1:], '', ('usage', 'help'))
if len(args) > 0:
print """
Usage: bz-make-components.py
Sync package information from the package database to bugzilla.
"""
sys.exit(1)
# Initialize the connection to bugzilla
bugzilla = Bugzilla(BZSERVER, BZUSER, BZPASS)
# Non-fatal errors to alert people about
errors = []
# Get bugzilla information from the package database
ownerPage = urllib2.urlopen(PKGDBSERVER)
bugzillaData = simplejson.load(ownerPage)
ownerPage.close()
acls = bugzillaData['bugzillaAcls']
del bugzillaData
for product in acls.keys():
for pkg in acls[product]:
pkgInfo = acls[product][pkg]
### FIXME:
# Catch the exceptions and save information into email to send
print 'here we are'
print 'pkg:%s' % pkg
print 'product:%s' % product
print 'pkgInfo.owner:%s' % pkgInfo['owner']
print 'pkgInfo.summary:%s' % pkgInfo['summary']
print 'pkgInfo.qacontact:%s' % pkgInfo['qacontact']
print 'pkgInfo.cclist:%s' % pkgInfo['cclist']
sys.exit(1)
try:
bugzilla.add_edit_component(pkg, product, pkgInfo['owner'],
pkgInfo['summary'], pkgInfo['qacontact'],
pkgInfo['cclist'])
except ValueError, e:
# A username didn't have a bugzilla address
errors.append(e)
except DataChangedError, e:
# A Package or Collection was returned via xmlrpc but wasn't
# present when we tried to change it
errors.append(e)
except xmlrpclib.Error, e:
# An error occurred in the xmlrpc call. Shouldn't happen but
# we better se what it is
errors.append(e)
# Send notification of errors
if errors:
website.send_email('accounts(a)fedoraproject.org',
'toshio(a)fedoraproject.org',
'Errors while syncing bugzilla with the PackageDB',
'''
In order to make bugzilla components for Fedora-related programs, we need to have an existing bugzilla account for
the listed owner. You (%s) do not have a bugzilla account, but are listed as the owner for the following components:
%s
Please create a bugzilla account for %s immediately, because this amazingly stupid cron job will keep sending you an
e-mail every hour until you do :)
- The management
''' % ('\n'.join(str(errors)),))
sys.exit(0)
12 years, 5 months
rpms/ekg/FC-6 ekg-external-libgadu.patch, 1.1, 1.2 ekg.spec, 1.2, 1.3 sources, 1.2, 1.3
by fedora-extras-commits＠redhat.com
Author: rathann
Update of /cvs/pkgs/rpms/ekg/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14681
Modified Files:
ekg-external-libgadu.patch ekg.spec sources
Log Message:
- 1.7 final
- enable voip support (gsm is in Fedora now)
- remove redundant BR: autoconf
- support giflib
- fixes CVE-2007-166{3,4,5} (bug #246034)
ekg-external-libgadu.patch:
Index: ekg-external-libgadu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/FC-6/ekg-external-libgadu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ekg-external-libgadu.patch 17 Sep 2006 20:15:55 -0000 1.1
+++ ekg-external-libgadu.patch 29 Jun 2007 23:53:45 -0000 1.2
@@ -1,5 +1,5 @@
---- ekg-1.7rc2/configure.in.libgadu 2006-04-18 21:05:10.000000000 +0200
-+++ ekg-1.7rc2/configure.in 2006-09-17 18:33:03.000000000 +0200
+--- ekg-1.7/configure.in.libgadu 2007-03-11 13:27:04.000000000 +0100
++++ ekg-1.7/configure.in 2007-06-29 22:23:38.000000000 +0200
@@ -313,6 +313,39 @@
dnl I zaczynamy wykrywaæ ¶mieci dla ekg...
dnl
@@ -40,8 +40,8 @@
dnl dirname - get rid of libgen
AC_CHECK_HEADERS(libgen.h)
AC_CHECK_FUNC(dirname, , [OBJS="$OBJS ../compat/dirname.o"])
---- ekg-1.7rc2/src/Makefile.in.libgadu 2006-08-05 17:46:23.000000000 +0200
-+++ ekg-1.7rc2/src/Makefile.in 2006-09-17 18:33:03.000000000 +0200
+--- ekg-1.7/src/Makefile.in.libgadu 2007-04-28 22:02:22.000000000 +0200
++++ ekg-1.7/src/Makefile.in 2007-06-29 22:24:20.000000000 +0200
@@ -10,7 +10,7 @@
sysconfdir = @sysconfdir@
@@ -51,17 +51,17 @@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-@@ -27,7 +27,7 @@
- all: dep ekg @ioctld@
+@@ -28,7 +28,7 @@
- ekg: $(OBJS) @libgadu_a@
-- $(CC) $(CFLAGS) -o ekg $(OBJS) -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
-+ $(CC) $(CFLAGS) -o ekg $(OBJS) @LIBGADU_LIBPATH@ @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
+ ekg: $(OBJS) comptime.c @libgadu_a@
+ $(CC) $(CFLAGS) -c -o comptime.o comptime.c
+- $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
++ $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o @LIBGADU_LIBPATH@ @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
ioctld: ioctld.c
$(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
---- ekg-1.7rc2/src/stuff.c.libgadu 2006-09-17 18:34:13.000000000 +0200
-+++ ekg-1.7rc2/src/stuff.c 2006-09-17 18:33:56.000000000 +0200
+--- ekg-1.7/src/stuff.c.libgadu 2007-04-28 22:02:24.000000000 +0200
++++ ekg-1.7/src/stuff.c 2007-06-29 22:23:38.000000000 +0200
@@ -53,7 +53,6 @@
#include <unistd.h>
@@ -70,8 +70,8 @@
#include "dynstuff.h"
#include "libgadu.h"
#ifdef HAVE_OPENSSL
---- ekg-1.7rc2/Makefile.in.libgadu 2006-09-17 18:33:03.000000000 +0200
-+++ ekg-1.7rc2/Makefile.in 2006-09-17 18:33:03.000000000 +0200
+--- ekg-1.7/Makefile.in.libgadu 2007-06-29 22:23:38.000000000 +0200
++++ ekg-1.7/Makefile.in 2007-06-29 22:23:38.000000000 +0200
@@ -15,7 +15,7 @@
#
Index: ekg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/FC-6/ekg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ekg.spec 17 Sep 2006 20:15:55 -0000 1.2
+++ ekg.spec 29 Jun 2007 23:53:45 -0000 1.3
@@ -1,8 +1,6 @@
-%define _pre rc2
-
Name: ekg
Version: 1.7
-Release: 0.3.%{_pre}%{?dist}
+Release: 1%{?dist}
Summary: A client compatible with Gadu-Gadu
Summary(de): Ein Cliente kompatibel mit Gadu-Gadu
Summary(es): Un cliente compatible con Gadu-Gadu
@@ -10,15 +8,15 @@
Summary(pl): Klient kompatybilny z Gadu-Gadu
License: GPL
Group: Applications/Internet
-Source0: http://ekg.chmurka.net/%{name}-%{version}%{_pre}.tar.gz
+Source0: http://ekg.chmurka.net/%{name}-%{version}.tar.gz
Source1: %{name}.conf
Patch0: %{name}-rpm.patch
Patch1: %{name}-external-libgadu.patch
URL: http://ekg.chmurka.net/
BuildRequires: aspell-devel
-BuildRequires: autoconf
BuildRequires: automake
-%{?_with_voip:BuildRequires: gsm-devel}
+BuildRequires: giflib-devel
+BuildRequires: gsm-devel
BuildRequires: libgadu-devel
BuildRequires: libjpeg-devel
BuildRequires: ncurses-devel
@@ -74,7 +72,7 @@
polsku (jednak komendy sÄ
w jÄzyku angielskim).
%prep
-%setup -q -n %{name}-%{version}%{_pre}
+%setup -q
%patch0 -p1 -b .r
%patch1 -p1 -b .libgadu
@@ -89,7 +87,7 @@
--enable-ioctld \
--disable-static \
--without-bind \
- %{?_with_voip:--with-libgsm} \
+ --with-libgsm \
--with-pthread \
--with-python \
--without-termcap \
@@ -142,6 +140,13 @@
%lang(pl) %{_mandir}/pl/man1/*
%changelog
+* Fri Jun 29 2007 Dominik Mierzejewski <rpm(a)greysector.net> 1.7-1
+- 1.7 final
+- enable voip support (gsm is in Fedora now)
+- remove redundant BR: autoconf
+- support giflib
+- fixes CVE-2007-166{3,4,5} (bug #246034)
+
* Sun Sep 17 2006 Dominik Mierzejewski <rpm(a)greysector.net> 1.7-0.3.rc2
- build with external libgadu
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Sep 2006 13:08:59 -0000 1.2
+++ sources 29 Jun 2007 23:53:45 -0000 1.3
@@ -1 +1 @@
-b4ea482130e163af1456699e2e6983d9 ekg-1.7rc2.tar.gz
+2aa92b56517fdf09d75519a105772b74 ekg-1.7.tar.gz
12 years, 5 months
rpms/ekg/F-7 ekg-external-libgadu.patch, 1.1, 1.2 ekg.spec, 1.3, 1.4 sources, 1.2, 1.3
by fedora-extras-commits＠redhat.com
Author: rathann
Update of /cvs/pkgs/rpms/ekg/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13122
Modified Files:
ekg-external-libgadu.patch ekg.spec sources
Log Message:
- 1.7 final
- enable voip support (gsm is in Fedora now)
- remove redundant BR: autoconf
- support giflib
- fixes CVE-2007-166{3,4,5} (bug #246034)
ekg-external-libgadu.patch:
Index: ekg-external-libgadu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/F-7/ekg-external-libgadu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ekg-external-libgadu.patch 17 Sep 2006 20:15:55 -0000 1.1
+++ ekg-external-libgadu.patch 29 Jun 2007 23:32:39 -0000 1.2
@@ -1,5 +1,5 @@
---- ekg-1.7rc2/configure.in.libgadu 2006-04-18 21:05:10.000000000 +0200
-+++ ekg-1.7rc2/configure.in 2006-09-17 18:33:03.000000000 +0200
+--- ekg-1.7/configure.in.libgadu 2007-03-11 13:27:04.000000000 +0100
++++ ekg-1.7/configure.in 2007-06-29 22:23:38.000000000 +0200
@@ -313,6 +313,39 @@
dnl I zaczynamy wykrywaæ ¶mieci dla ekg...
dnl
@@ -40,8 +40,8 @@
dnl dirname - get rid of libgen
AC_CHECK_HEADERS(libgen.h)
AC_CHECK_FUNC(dirname, , [OBJS="$OBJS ../compat/dirname.o"])
---- ekg-1.7rc2/src/Makefile.in.libgadu 2006-08-05 17:46:23.000000000 +0200
-+++ ekg-1.7rc2/src/Makefile.in 2006-09-17 18:33:03.000000000 +0200
+--- ekg-1.7/src/Makefile.in.libgadu 2007-04-28 22:02:22.000000000 +0200
++++ ekg-1.7/src/Makefile.in 2007-06-29 22:24:20.000000000 +0200
@@ -10,7 +10,7 @@
sysconfdir = @sysconfdir@
@@ -51,17 +51,17 @@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-@@ -27,7 +27,7 @@
- all: dep ekg @ioctld@
+@@ -28,7 +28,7 @@
- ekg: $(OBJS) @libgadu_a@
-- $(CC) $(CFLAGS) -o ekg $(OBJS) -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
-+ $(CC) $(CFLAGS) -o ekg $(OBJS) @LIBGADU_LIBPATH@ @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
+ ekg: $(OBJS) comptime.c @libgadu_a@
+ $(CC) $(CFLAGS) -c -o comptime.o comptime.c
+- $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
++ $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o @LIBGADU_LIBPATH@ @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
ioctld: ioctld.c
$(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
---- ekg-1.7rc2/src/stuff.c.libgadu 2006-09-17 18:34:13.000000000 +0200
-+++ ekg-1.7rc2/src/stuff.c 2006-09-17 18:33:56.000000000 +0200
+--- ekg-1.7/src/stuff.c.libgadu 2007-04-28 22:02:24.000000000 +0200
++++ ekg-1.7/src/stuff.c 2007-06-29 22:23:38.000000000 +0200
@@ -53,7 +53,6 @@
#include <unistd.h>
@@ -70,8 +70,8 @@
#include "dynstuff.h"
#include "libgadu.h"
#ifdef HAVE_OPENSSL
---- ekg-1.7rc2/Makefile.in.libgadu 2006-09-17 18:33:03.000000000 +0200
-+++ ekg-1.7rc2/Makefile.in 2006-09-17 18:33:03.000000000 +0200
+--- ekg-1.7/Makefile.in.libgadu 2007-06-29 22:23:38.000000000 +0200
++++ ekg-1.7/Makefile.in 2007-06-29 22:23:38.000000000 +0200
@@ -15,7 +15,7 @@
#
Index: ekg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/F-7/ekg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ekg.spec 14 Dec 2006 21:57:11 -0000 1.3
+++ ekg.spec 29 Jun 2007 23:32:39 -0000 1.4
@@ -1,8 +1,6 @@
-%define _pre rc2
-
Name: ekg
Version: 1.7
-Release: 0.4.%{_pre}%{?dist}
+Release: 1%{?dist}
Summary: A client compatible with Gadu-Gadu
Summary(de): Ein Cliente kompatibel mit Gadu-Gadu
Summary(es): Un cliente compatible con Gadu-Gadu
@@ -10,15 +8,15 @@
Summary(pl): Klient kompatybilny z Gadu-Gadu
License: GPL
Group: Applications/Internet
-Source0: http://ekg.chmurka.net/%{name}-%{version}%{_pre}.tar.gz
+Source0: http://ekg.chmurka.net/%{name}-%{version}.tar.gz
Source1: %{name}.conf
Patch0: %{name}-rpm.patch
Patch1: %{name}-external-libgadu.patch
URL: http://ekg.chmurka.net/
BuildRequires: aspell-devel
-BuildRequires: autoconf
BuildRequires: automake
-%{?_with_voip:BuildRequires: gsm-devel}
+BuildRequires: giflib-devel
+BuildRequires: gsm-devel
BuildRequires: libgadu-devel
BuildRequires: libjpeg-devel
BuildRequires: ncurses-devel
@@ -74,7 +72,7 @@
polsku (jednak komendy sÄ
w jÄzyku angielskim).
%prep
-%setup -q -n %{name}-%{version}%{_pre}
+%setup -q
%patch0 -p1 -b .r
%patch1 -p1 -b .libgadu
@@ -89,7 +87,7 @@
--enable-ioctld \
--disable-static \
--without-bind \
- %{?_with_voip:--with-libgsm} \
+ --with-libgsm \
--with-pthread \
--with-python \
--without-termcap \
@@ -142,6 +140,13 @@
%lang(pl) %{_mandir}/pl/man1/*
%changelog
+* Fri Jun 29 2007 Dominik Mierzejewski <rpm(a)greysector.net> 1.7-1
+- 1.7 final
+- enable voip support (gsm is in Fedora now)
+- remove redundant BR: autoconf
+- support giflib
+- fixes CVE-2007-166{3,4,5} (bug #246034)
+
* Thu Dec 14 2006 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.7-0.4.rc2
- Rebuild for updated python.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Sep 2006 13:08:59 -0000 1.2
+++ sources 29 Jun 2007 23:32:39 -0000 1.3
@@ -1 +1 @@
-b4ea482130e163af1456699e2e6983d9 ekg-1.7rc2.tar.gz
+2aa92b56517fdf09d75519a105772b74 ekg-1.7.tar.gz
12 years, 5 months
rpms/ekg/devel .cvsignore, 1.2, 1.3 ekg-external-libgadu.patch, 1.1, 1.2 ekg.spec, 1.3, 1.4 sources, 1.2, 1.3
by fedora-extras-commits＠redhat.com
Author: rathann
Update of /cvs/pkgs/rpms/ekg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11037
Modified Files:
.cvsignore ekg-external-libgadu.patch ekg.spec sources
Log Message:
- 1.7 final
- enable voip support (gsm is in Fedora now)
- remove redundant BR: autoconf
- support giflib
- fixes CVE-2007-166{3,4,5} (bug #246034)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 7 Sep 2006 13:08:59 -0000 1.2
+++ .cvsignore 29 Jun 2007 23:20:53 -0000 1.3
@@ -1 +1 @@
-ekg-1.7rc2.tar.gz
+ekg-1.7.tar.gz
ekg-external-libgadu.patch:
Index: ekg-external-libgadu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/devel/ekg-external-libgadu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ekg-external-libgadu.patch 17 Sep 2006 20:15:55 -0000 1.1
+++ ekg-external-libgadu.patch 29 Jun 2007 23:20:53 -0000 1.2
@@ -1,5 +1,5 @@
---- ekg-1.7rc2/configure.in.libgadu 2006-04-18 21:05:10.000000000 +0200
-+++ ekg-1.7rc2/configure.in 2006-09-17 18:33:03.000000000 +0200
+--- ekg-1.7/configure.in.libgadu 2007-03-11 13:27:04.000000000 +0100
++++ ekg-1.7/configure.in 2007-06-29 22:23:38.000000000 +0200
@@ -313,6 +313,39 @@
dnl I zaczynamy wykrywaæ ¶mieci dla ekg...
dnl
@@ -40,8 +40,8 @@
dnl dirname - get rid of libgen
AC_CHECK_HEADERS(libgen.h)
AC_CHECK_FUNC(dirname, , [OBJS="$OBJS ../compat/dirname.o"])
---- ekg-1.7rc2/src/Makefile.in.libgadu 2006-08-05 17:46:23.000000000 +0200
-+++ ekg-1.7rc2/src/Makefile.in 2006-09-17 18:33:03.000000000 +0200
+--- ekg-1.7/src/Makefile.in.libgadu 2007-04-28 22:02:22.000000000 +0200
++++ ekg-1.7/src/Makefile.in 2007-06-29 22:24:20.000000000 +0200
@@ -10,7 +10,7 @@
sysconfdir = @sysconfdir@
@@ -51,17 +51,17 @@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-@@ -27,7 +27,7 @@
- all: dep ekg @ioctld@
+@@ -28,7 +28,7 @@
- ekg: $(OBJS) @libgadu_a@
-- $(CC) $(CFLAGS) -o ekg $(OBJS) -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
-+ $(CC) $(CFLAGS) -o ekg $(OBJS) @LIBGADU_LIBPATH@ @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
+ ekg: $(OBJS) comptime.c @libgadu_a@
+ $(CC) $(CFLAGS) -c -o comptime.o comptime.c
+- $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
++ $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o @LIBGADU_LIBPATH@ @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
ioctld: ioctld.c
$(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
---- ekg-1.7rc2/src/stuff.c.libgadu 2006-09-17 18:34:13.000000000 +0200
-+++ ekg-1.7rc2/src/stuff.c 2006-09-17 18:33:56.000000000 +0200
+--- ekg-1.7/src/stuff.c.libgadu 2007-04-28 22:02:24.000000000 +0200
++++ ekg-1.7/src/stuff.c 2007-06-29 22:23:38.000000000 +0200
@@ -53,7 +53,6 @@
#include <unistd.h>
@@ -70,8 +70,8 @@
#include "dynstuff.h"
#include "libgadu.h"
#ifdef HAVE_OPENSSL
---- ekg-1.7rc2/Makefile.in.libgadu 2006-09-17 18:33:03.000000000 +0200
-+++ ekg-1.7rc2/Makefile.in 2006-09-17 18:33:03.000000000 +0200
+--- ekg-1.7/Makefile.in.libgadu 2007-06-29 22:23:38.000000000 +0200
++++ ekg-1.7/Makefile.in 2007-06-29 22:23:38.000000000 +0200
@@ -15,7 +15,7 @@
#
Index: ekg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/devel/ekg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ekg.spec 14 Dec 2006 21:57:11 -0000 1.3
+++ ekg.spec 29 Jun 2007 23:20:53 -0000 1.4
@@ -1,8 +1,6 @@
-%define _pre rc2
-
Name: ekg
Version: 1.7
-Release: 0.4.%{_pre}%{?dist}
+Release: 1%{?dist}
Summary: A client compatible with Gadu-Gadu
Summary(de): Ein Cliente kompatibel mit Gadu-Gadu
Summary(es): Un cliente compatible con Gadu-Gadu
@@ -10,15 +8,15 @@
Summary(pl): Klient kompatybilny z Gadu-Gadu
License: GPL
Group: Applications/Internet
-Source0: http://ekg.chmurka.net/%{name}-%{version}%{_pre}.tar.gz
+Source0: http://ekg.chmurka.net/%{name}-%{version}.tar.gz
Source1: %{name}.conf
Patch0: %{name}-rpm.patch
Patch1: %{name}-external-libgadu.patch
URL: http://ekg.chmurka.net/
BuildRequires: aspell-devel
-BuildRequires: autoconf
BuildRequires: automake
-%{?_with_voip:BuildRequires: gsm-devel}
+BuildRequires: giflib-devel
+BuildRequires: gsm-devel
BuildRequires: libgadu-devel
BuildRequires: libjpeg-devel
BuildRequires: ncurses-devel
@@ -74,7 +72,7 @@
polsku (jednak komendy sÄ
w jÄzyku angielskim).
%prep
-%setup -q -n %{name}-%{version}%{_pre}
+%setup -q
%patch0 -p1 -b .r
%patch1 -p1 -b .libgadu
@@ -89,7 +87,7 @@
--enable-ioctld \
--disable-static \
--without-bind \
- %{?_with_voip:--with-libgsm} \
+ --with-libgsm \
--with-pthread \
--with-python \
--without-termcap \
@@ -142,6 +140,13 @@
%lang(pl) %{_mandir}/pl/man1/*
%changelog
+* Fri Jun 29 2007 Dominik Mierzejewski <rpm(a)greysector.net> 1.7-1
+- 1.7 final
+- enable voip support (gsm is in Fedora now)
+- remove redundant BR: autoconf
+- support giflib
+- fixes CVE-2007-166{3,4,5} (bug #246034)
+
* Thu Dec 14 2006 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.7-0.4.rc2
- Rebuild for updated python.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Sep 2006 13:08:59 -0000 1.2
+++ sources 29 Jun 2007 23:20:53 -0000 1.3
@@ -1 +1 @@
-b4ea482130e163af1456699e2e6983d9 ekg-1.7rc2.tar.gz
+2aa92b56517fdf09d75519a105772b74 ekg-1.7.tar.gz
12 years, 5 months
rpms/bigboard/F-7 bigboard.spec,1.9,1.10
by fedora-extras-commits＠redhat.com
Author: walters
Update of /cvs/extras/rpms/bigboard/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11021
Modified Files:
bigboard.spec
Log Message:
merge from devel
Index: bigboard.spec
===================================================================
RCS file: /cvs/extras/rpms/bigboard/F-7/bigboard.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bigboard.spec 8 Jun 2007 23:37:15 -0000 1.9
+++ bigboard.spec 29 Jun 2007 23:20:33 -0000 1.10
@@ -2,7 +2,7 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: bigboard
-Version: 0.4.6
+Version: 0.4.8
Release: 1%{?dist}
Summary: Sidebar application launcher using mugshot.org
@@ -12,13 +12,14 @@
Source0: http://download.mugshot.org/extras/bigboard/source/bigboard-%{version}.ta...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: mugshot >= 1.1.42-1
+Requires: mugshot >= 1.1.46-1
Requires: deskbar-applet
Requires: hippo-canvas-python >= 0.2.16
Requires: gnome-python2-desktop
Requires: gnome-python2-gnomedesktop
Requires: gnome-python2-gnomekeyring
Requires: gnome-python2-applet
+Requires: gnome-python2-gconf
Requires: dbus-python
BuildRequires: pkgconfig
@@ -35,7 +36,7 @@
%setup -q
%build
-%configure --disable-static --disable-pymod-checks
+%configure --disable-static --disable-pymod-checks --disable-schemas-install
make %{?_smp_mflags}
%install
@@ -48,9 +49,14 @@
%files
%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/gconf/schemas/bigboard.schemas
%doc COPYING
%dir %{_libexecdir}/bigboard
%attr(0755,root,root) %{_libexecdir}/bigboard/*
+%dir %{python_sitearch}/mugshot
+%{python_sitearch}/mugshot/*.py
+%{python_sitearch}/mugshot/*.pyc
+%{python_sitearch}/mugshot/*.pyo
%dir %{python_sitearch}/bigboard
%{python_sitearch}/bigboard/*.so
%{python_sitearch}/bigboard/*.py
@@ -77,7 +83,15 @@
# no desktop file included because the bigboard is launched as part of online
# desktop mode
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+killall -HUP gconfd-2 || :
+
%changelog
+* Fri Jun 29 2007 Colin Walters <walters(a)redhat.com> - 0.4.8-1
+- merge from devel
+
* Fri Jun 08 2007 Colin Walters <walters(a)redhat.com> - 0.4.6-1
- update
- disable pymod checks
12 years, 5 months
rpms/bigboard/devel bigboard.spec,1.17,1.18
by fedora-extras-commits＠redhat.com
Author: walters
Update of /cvs/extras/rpms/bigboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv821
Modified Files:
bigboard.spec
Log Message:
Index: bigboard.spec
===================================================================
RCS file: /cvs/extras/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bigboard.spec 29 Jun 2007 22:03:35 -0000 1.17
+++ bigboard.spec 29 Jun 2007 22:45:07 -0000 1.18
@@ -3,7 +3,7 @@
Name: bigboard
Version: 0.4.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Sidebar application launcher using mugshot.org
Group: Applications/Internet
@@ -36,7 +36,7 @@
%setup -q
%build
-%configure --disable-static --disable-pymod-checks
+%configure --disable-static --disable-pymod-checks --disable-schemas-install
make %{?_smp_mflags}
%install
@@ -90,8 +90,9 @@
killall -HUP gconfd-2 || :
%changelog
-* Fri Jun 29 2007 Colin Walters <walters(a)redhat.com> - 0.4.8-1
+* Fri Jun 29 2007 Colin Walters <walters(a)redhat.com> - 0.4.8-2
- update
+- disable schemas install
* Thu Jun 28 2007 Colin Walters <walters(a)redhat.com> - 0.4.7-1
- update
12 years, 5 months