rpms/klatexformula/devel .cvsignore, 1.2, 1.3 klatexformula.spec, 1.2, 1.3 sources, 1.2, 1.3 klatexformula-gcc44.patch, 1.1, NONE

[nucleo]

Author: nucleo

Update of /cvs/pkgs/rpms/klatexformula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13044

Modified Files:
	.cvsignore klatexformula.spec sources 
Removed Files:
	klatexformula-gcc44.patch 
Log Message:
update to 3.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/klatexformula/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 May 2009 22:37:17 -0000	1.2
+++ .cvsignore	22 Nov 2009 16:08:00 -0000	1.3
@@ -1 +1 @@
-klatexformula-3.0.1.tar.gz
+klatexformula-3.1.2.tar.gz


Index: klatexformula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/klatexformula/devel/klatexformula.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- klatexformula.spec	25 Jul 2009 04:38:58 -0000	1.2
+++ klatexformula.spec	22 Nov 2009 16:08:01 -0000	1.3
@@ -1,12 +1,11 @@
 Name:             klatexformula
-Version:          3.0.1
-Release:          4%{?dist}
+Version:          3.1.2
+Release:          1%{?dist}
 Summary:          Application for easy image creating from a LaTeX equation
 Group:            Applications/Publishing
 License:          GPLv2+
 URL:              http://klatexformula.sourceforge.net/
 Source0:          http://downloads.sourceforge.net/klatexformula/%{name}-%{version}.tar.gz
-Patch0:           klatexformula-gcc44.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    qt4-devel
 BuildRequires:    desktop-file-utils
@@ -39,32 +38,18 @@ Development files for the libklfbackend.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc44
-
-sed -i "s|LIBRARY_TYPE = staticlib||g" src/klfbackend/klfbackend.pro
 
 %build
-%{_qt4_qmake}
+%{_qt4_qmake} QMAKE=%{_qt4_qmake} BACKEND_INSTALLLIBDIR=%{_libdir} INSTALLPREFIX=%{_prefix} BACKEND_SHAREDORSTATIC=dll
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -D -m 755 %{name} $RPM_BUILD_ROOT/%{_bindir}/%{name}
-install -D -m 755 %{name}_cmdl $RPM_BUILD_ROOT/%{_bindir}/%{name}_cmdl
-install -D -m 755 src/klfbackend/libklfbackend.so.3.0.1 $RPM_BUILD_ROOT/%{_libdir}/libklfbackend.so.3.0.1
-cp -P src/klfbackend/libklfbackend.so $RPM_BUILD_ROOT/%{_libdir}/libklfbackend.so
-cp -P src/klfbackend/libklfbackend.so.3 $RPM_BUILD_ROOT/%{_libdir}/libklfbackend.so.3
-cp -P src/klfbackend/libklfbackend.so.3.0 $RPM_BUILD_ROOT/%{_libdir}/libklfbackend.so.3.0
-install -p -D -m 644 src/klfbackend/klfbackend.h $RPM_BUILD_ROOT/%{_includedir}/klfbackend.h
-install -p -D -m 644 src/klfbackend/klfblockprocess.h $RPM_BUILD_ROOT/%{_includedir}/klfblockprocess.h
-install -p -D -m 644 src/hi16-app-klatexformula.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -p -D -m 644 src/hi32-app-klatexformula.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -D -m 644 src/hi64-app-klatexformula.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-
-desktop-file-install \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    src/%{name}.desktop
+make install INSTALL_ROOT=$RPM_BUILD_ROOT
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,10 +75,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc AUTHORS COPYING README
 %{_bindir}/%{name}
 %{_bindir}/%{name}_cmdl
+%{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %files -n libklfbackend
 %defattr(-,root,root,-)
@@ -108,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_includedir}/klfbackend.h
 
 %changelog
+* Sun Nov 22 2009 Alexey Kurov <nucleo at fedoraproject.org> - 3.1.2-1
+- update to 3.1.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/klatexformula/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 May 2009 22:37:17 -0000	1.2
+++ sources	22 Nov 2009 16:08:01 -0000	1.3
@@ -1 +1 @@
-ecf49035633cfe791e6140acaeb7eeb5  klatexformula-3.0.1.tar.gz
+fd6a88eb6b6e2d3845657c13919d2cd3  klatexformula-3.1.2.tar.gz


--- klatexformula-gcc44.patch DELETED ---