diff --git a/dia.spec b/dia.spec index 03bf8dd..aa51c1b 100644 --- a/dia.spec +++ b/dia.spec @@ -2,7 +2,7 @@ %define with_cairo 0 %define majver %(echo %version | cut -d. -f 1-2) Name: dia -Version: 0.97.2 +Version: 0.97.2.20140825git Release: 1mamba Summary: Dia is a gtk+ based diagram creation program Group: Graphical Desktop/Applications/Graphics @@ -10,7 +10,8 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://live.gnome.org/Dia -Source: http://ftp.gnome.org/pub/gnome/sources/%{name}/%{majver}/%{name}-%{version}.tar.xz +Source: git://git.gnome.org/dia.git/master/%{name}-%{version}.tar.bz2 +#Source: http://ftp.gnome.org/pub/gnome/sources/%{name}/%{majver}/%{name}-%{version}.tar.xz ##ftp://ftp.gnome.org/pub/gnome/sources/dia/%{version}/dia-%{version}.tar.bz2 Patch0: %{name}-0.95-use_kde_browser.patch Patch1: %{name}-0.95-cve_2006_2480.patch @@ -28,36 +29,73 @@ BuildRequires: libart_lgpl-devel >= 2.0.0 BuildRequires: gettext-devel >= 0.14.0 BuildRequires: xmlto >= 0.0.18 ## AUTOBUILDREQ-BEGIN -BuildRequires: GConf-devel BuildRequires: glibc-devel +BuildRequires: libEMF-devel +BuildRequires: libGConf-devel +BuildRequires: libICE-devel +BuildRequires: libORBit2-devel +BuildRequires: libSM-devel +BuildRequires: libX11-devel +BuildRequires: libXau-devel +BuildRequires: libXcomposite-devel +BuildRequires: libXcursor-devel +BuildRequires: libXdamage-devel +BuildRequires: libXdmcp-devel +BuildRequires: libXext-devel +BuildRequires: libXfixes-devel +BuildRequires: libXinerama-devel +BuildRequires: libXrandr-devel +BuildRequires: libXrender-devel BuildRequires: libart_lgpl-devel BuildRequires: libatk-devel +BuildRequires: libavahi-devel +BuildRequires: libavahi-glib-devel BuildRequires: libbonobo-devel BuildRequires: libbonoboui-devel -%if %with_cairo +BuildRequires: libbzip2-devel BuildRequires: libcairo-devel -%endif +BuildRequires: libcanberra-devel +BuildRequires: libdbus-devel +BuildRequires: libdbus-glib-devel +BuildRequires: libelf-devel +BuildRequires: libexpat-devel +BuildRequires: libffi-devel BuildRequires: libfontconfig-devel -BuildRequires: libfreetype-devel >= 2.0.9 -BuildRequires: libglib-devel >= 2.0.0 -BuildRequires: libgnomecanvas-devel +BuildRequires: libfreetype-devel +BuildRequires: libgcc +BuildRequires: libgcrypt-devel +BuildRequires: libgdk-pixbuf-devel +BuildRequires: libglib-devel BuildRequires: libgnome-devel BuildRequires: libgnome-keyring-devel -BuildRequires: libgnomeui-devel BuildRequires: libgnome-vfs-devel -BuildRequires: libgtk-devel >= 2.0.0 -BuildRequires: libICE-devel -BuildRequires: libpango-devel >= 1.1.5 -BuildRequires: libpng-devel >= 1.2.8 +BuildRequires: libgnomecanvas-devel +BuildRequires: libgnomeui-devel +BuildRequires: libgpg-error-devel +BuildRequires: libgraphite2-devel +BuildRequires: libgtk2-devel +BuildRequires: libharfbuzz-devel +BuildRequires: libltdl-devel +BuildRequires: liblzma-devel +BuildRequires: libogg-devel +BuildRequires: libopenssl-devel +BuildRequires: libpango-devel +BuildRequires: libpng-devel +BuildRequires: libpng15-devel BuildRequires: libpopt-devel -BuildRequires: libSM-devel -BuildRequires: libxml2-devel >= 2.0.0 -BuildRequires: libxslt-devel >= 1.1.15 -BuildRequires: libz-devel >= 1.2.3 -BuildRequires: ORBit2-devel -%if %with_python -BuildRequires: pygtk +BuildRequires: libpython27-devel +BuildRequires: libselinux-devel +BuildRequires: libssp-devel +BuildRequires: libstdc++6-devel +BuildRequires: libtdb-devel +BuildRequires: libuuid-devel +BuildRequires: libvorbis-devel +BuildRequires: libxcb-devel +BuildRequires: libxml2-devel +BuildRequires: libxslt-devel +BuildRequires: libz-devel ## AUTOBUILDREQ-END +%if %with_python BuildRequires: python >= 1.5.2 BuildRequires: libpython-devel BuildRequires: python-pyxml >= 0.8.4 @@ -88,20 +126,24 @@ This package contains the dia plugins for python. %prep %setup -q +#-D -T +#:<< _EOF # note: remove this comment to use konqueror instead of gnome-open #%patch0 -p1 #%patch1 -p1 -b .cve_2006_2480 #%patch2 -p1 -b .formatstring #%patch3 -p1 -b .dtdfix %patch4 -p1 -b .help -%patch5 -p1 +#%patch5 -p1 %ifarch x86_64 %patch6 -p1 -# FIXME: workaround -sed -i "s|\${py_lib}/libpython|lib64/libpython|" configure +## FIXME: workaround +#sed -i "s|\${py_lib}/libpython|lib64/libpython|" configure %endif %build +#:<< _EOF +./autogen.sh %configure \ --enable-gnome \ %if %with_cairo @@ -145,11 +187,13 @@ ln -s %{_datadir}/gnome/help/dia %{buildroot}%{_datadir}/dia/help %{_libdir}/dia/* %{_datadir}/applications/* %dir %{_datadir}/dia -#%{_datadir}/dia/dia_logo.png -#%dir %{_datadir}/dia/images -#%{_datadir}/dia/images/* +%dir %{_datadir}/dia/Shape_Design +%dir %{_datadir}/dia/Shape_Design/Misc +%{_datadir}/dia/Shape_Design/Misc/* %dir %{_datadir}/dia/ui -%{_datadir}/dia/ui/*-ui.xml +%{_datadir}/dia/ui/*.xml +%dir %{_datadir}/dia/samples/ +%{_datadir}/dia/samples/*.dia %dir %{_datadir}/dia/shapes %{_datadir}/dia/shapes/* %dir %{_datadir}/dia/sheets @@ -173,14 +217,16 @@ ln -s %{_datadir}/gnome/help/dia %{buildroot}%{_datadir}/dia/help %lang(fr) %{_datadir}/doc/dia/fr/* %lang(pl) %dir %{_datadir}/doc/dia/pl %lang(pl) %{_datadir}/doc/dia/pl/* -%{_mandir}/fr/man1/dia.1.gz - +%{_mandir}/fr/man1/dia.1* +%lang(de) %dir %{_docdir}/dia/de/examples +%lang(de) %dir %{_docdir}/dia/de/examples/* %dir %{_datadir}/gnome/help/dia %{_datadir}/gnome/help/dia/* %{_datadir}/mime-info/* #%{_datadir}/pixmaps/* %{_mandir}/man1/dia.* -%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO +%doc AUTHORS COPYING +#ChangeLog NEWS README THANKS TODO %if %with_python %files -n python-%{name} @@ -191,6 +237,9 @@ ln -s %{_datadir}/gnome/help/dia %{buildroot}%{_datadir}/dia/help %endif %changelog +* Mon Aug 25 2014 Silvan Calarco 0.97.2.20140825git-1mamba +- update to 0.97.2.20140825git + * Sat Jul 21 2012 Automatic Build System 0.97.2-1mamba - update to 0.97.2