rpms/dia/devel .cvsignore, 1.4, 1.5 dia.spec, 1.16, 1.17 sources, 1.4, 1.5

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12550

Modified Files:
	.cvsignore dia.spec sources 
Log Message:
* Thu Mar 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.96-1
- New upstream release 0.96
- Drop upstreamed python-25 and sigpipe patches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Feb 2007 12:07:31 -0000	1.4
+++ .cvsignore	29 Mar 2007 12:39:26 -0000	1.5
@@ -1 +1 @@
-dia-0.95-1.tar.bz2
+dia-0.96.tar.bz2


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dia.spec	21 Feb 2007 12:07:31 -0000	1.16
+++ dia.spec	29 Mar 2007 12:39:26 -0000	1.17
@@ -1,17 +1,15 @@
 Name:           dia
-Version:        0.95
-Release:        8%{?dist}
+Version:        0.96
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.gnome.org/projects/dia/
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}-1.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Patch1:         dia-0.92.2-dtd.patch
 Patch2:         dia-0.95-pre6-help.patch
 Patch3:         dia-0.94-fallbacktoxpmicons.patch
-Patch4:         dia-0.95-sigpipe.patch
-Patch5:         dia-0.95-python-2.5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
@@ -28,12 +26,10 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-1
+%setup -q
 %patch1 -p1 -b .dtd
 %patch2 -p1 -b .help
 %patch3 -p1 -b .fallbacktoxpmicons
-%patch4 -p1 -b .sigpipe
-%patch5 -p0 -b .py25
 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`
@@ -46,15 +42,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %name
 
 # stop rpmlint from complaining
-chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/python/gtkcons.py
-
-# remove scrollkeeper stuff we don't include in the package
-rm -rf $RPM_BUILD_ROOT/var
-
-%find_lang %name
+chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/python/gtkcons.py \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/python/doxrev.py
 
 # Since we're not using the cairo stuff, but a stub plugin still
 # gets built, Dia complains it doesn't have an init function.  So
@@ -89,8 +82,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog KNOWN_BUGS INSTALL NEWS README TODO THANKS doc/custom-shapes doc/diagram.dtd doc/shape.dtd doc/sheet.dtd
-%doc samples/
+%doc AUTHORS COPYING ChangeLog KNOWN_BUGS NEWS README TODO THANKS
+%doc doc/custom-shapes doc/diagram.dtd doc/shape.dtd doc/sheet.dtd samples/
 %{_bindir}/%{name}
 %{_libdir}/%{name}
 %{_mandir}/*/*
@@ -105,6 +98,10 @@
 
 
 %changelog
+* Thu Mar 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.96-1
+- New upstream release 0.96
+- Drop upstreamed python-25 and sigpipe patches
+
 * Tue Feb 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-8
 - Upgrade to upstream bugfix release 0.95-1
 - Drop upstreamed ungroup and formatstring patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Feb 2007 12:07:31 -0000	1.4
+++ sources	29 Mar 2007 12:39:26 -0000	1.5
@@ -1 +1 @@
-bd4d5bd71b60b9ce11610256534e4d82  dia-0.95-1.tar.bz2
+0c173dd5f46672efb77952ecbd884bfd  dia-0.96.tar.bz2