rpms/qtpfsgui/FC-6 qt4-i18ndir.patch, NONE, 1.1 qtpfsgui.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Douglas E. Warner (silfreed) fedora-extras-commits at redhat.com
Wed Jul 11 11:38:57 UTC 2007


Author: silfreed

Update of /cvs/pkgs/rpms/qtpfsgui/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28749/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	qt4-i18ndir.patch qtpfsgui.spec 
Log Message:
importing qtpfsgui-1.8.9-5 into FC-6

qt4-i18ndir.patch:

--- NEW FILE qt4-i18ndir.patch ---
diff -ruN qtpfsgui-1.8.9-orig/project.pro qtpfsgui-1.8.9/project.pro
--- qtpfsgui-1.8.9-orig/project.pro	2007-06-09 10:30:18.000000000 -0400
+++ qtpfsgui-1.8.9/project.pro	2007-06-29 14:21:10.000000000 -0400
@@ -188,12 +188,12 @@
 
 MAJOR_MINOR_QT_VERSION = $$[QT_VERSION]
 MAJOR_MINOR_QT_VERSION ~= s/(4\..)\../\1
-contains(MAJOR_MINOR_QT_VERSION,4.2) {
-DEFINES += I18NDIR=\\\"$$I18NDIR\\\"
-#message("Detected Qt4.2")
-} else {
+contains(MAJOR_MINOR_QT_VERSION,4.1) {
 DEFINES += I18NDIR=\"$$I18NDIR\"
 #message("Detected Qt4.1")
+} else {
+DEFINES += I18NDIR=\\\"$$I18NDIR\\\"
+#message("Detected Qt>4.1")
 }
 #################################################################################################
 #CONFIG += debug


--- NEW FILE qtpfsgui.spec ---
Summary: A graphical tool for creating and tone-mapping HDR images
Name: qtpfsgui
Version: 1.8.9
Release: 5%{?dist}
#Epoch: 1
License: GPL
Group: Applications/Productivity
Source0: http://downloads.sourceforge.net/qtpfsgui/%{name}-%{version}.tgz
# patch for fixing I18NPATH define in newer QT4's
Patch0: qt4-i18ndir.patch
URL: http://qtpfsgui.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel, OpenEXR-devel, exiv2-devel, fftw-devel
BuildRequires: libjpeg-devel, libtiff-devel
BuildRequires: desktop-file-utils

%description
Qtpfsgui is a graphical program for assembling bracketed photos into High
Dynamic Range (HDR) images.  It also provides a number of tone-mapping
operators for creating low dynamic range versions of HDR images.

%prep
%setup -q
%patch0 -p1

# fix inconsistant newlines
%{__sed} -i 's/\r//' Changelog

%build
qmake-qt4 PREFIX=%{_prefix}
make %{_smp_mflags}

%install
rm -rf %{buildroot}
make install -e INSTALL_ROOT=%{buildroot} COPY="cp -pf"

desktop-file-install --vendor="fedora" --delete-original \
	--dir=%{buildroot}/%{_datadir}/applications \
	%{buildroot}/%{_datadir}/applications/%{name}.desktop

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%files
%defattr(-, root, root)
%doc AUTHORS COPYING Changelog NEWS README TODO
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png

%changelog
* Tue Jul 10 2007 Douglas E. Warner <silfreed at silfreed.net> 1.8.9-5
- preserving timestamps on install
- removed INSTALL file from docs
- updating GTK icon cache

* Wed Jul 04 2007 Douglas E. Warner <silfreed at silfreed.net> 1.8.9-4
- cleaning up summary and description
- fixing newlines in prep instead of install
- updating desktop-file-install to call --delete-original to remove that
  manual step

* Mon Jul 02 2007 Douglas E. Warner <silfreed at silfreed.net> 1.8.9-3
- removing explicit Requires

* Fri Jun 29 2007 Douglas E. Warner <silfreed at silfreed.net> 1.8.9-2
- documenting hacks
- installing desktop file

* Sun Jun 10 2007 Douglas E. Warner <silfreed at silfreed.net> 1.8.9-1
- new version
- not stripping binary and building debuginfo binary

* Wed May 16 2007 Douglas E. Warner <silfreed at silfreed.net> 1.8.8-1
- new version
- removed prefix patch (fixed upstream)

* Sat Apr 28 2007 Douglas E. Warner <silfreed at silfreed.net> 1.8.7-1
- new version

* Sat Apr 28 2007 Douglas E. Warner <silfreed at silfreed.net> 1.8.5-1
- new version

* Sun Mar 25 2007 Douglas E. Warner <silfreed at silfreed.net> 1.8.3-2
- fixing rpmlint errors
- removing explicit library requires
- stripping qtpfsgui binary
- fixing newlines in Changelog
- changed group from Applications/Desktop to Applications/Productivity

* Thu Mar 22 2007 Douglas E. Warner <silfreed at silfreed.net> 1.8.3-1
- Version increase

* Thu Mar 22 2007 Douglas E. Warner <silfreed at silfreed.net> 1.8.2-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtpfsgui/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Jul 2007 22:43:50 -0000	1.1
+++ .cvsignore	11 Jul 2007 11:38:24 -0000	1.2
@@ -0,0 +1 @@
+qtpfsgui-1.8.9.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtpfsgui/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Jul 2007 22:43:50 -0000	1.1
+++ sources	11 Jul 2007 11:38:24 -0000	1.2
@@ -0,0 +1 @@
+e7a53c181e9f14bf046995d1ccb2f7bf  qtpfsgui-1.8.9.tgz




More information about the scm-commits mailing list