rpms/munipack/devel muniwin.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 munipack.spec, 1.6, 1.7 sources, 1.3, 1.4

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/munipack/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14407

Modified Files:
	.cvsignore munipack.spec sources 
Added Files:
	muniwin.desktop 
Log Message:
update to 1.2.10, disable static libs, package cleanups


--- NEW FILE muniwin.desktop ---
[Desktop Entry]
Version=1.0
Name=muniwin
GenericName=Tool for reducing astronomy CCD images
Comment=Tool for reducing astronomy CCD images
Exec=muniwin
Icon=muniwin
StartupNotify=false
Terminal=false
Type=Application
Categories=Graphics;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/munipack/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jun 2008 17:34:47 -0000	1.3
+++ .cvsignore	28 May 2010 21:45:02 -0000	1.4
@@ -1 +1 @@
-cmunipack-1.1.24.tar.gz
+cmunipack-1.2.10.tar.gz


Index: munipack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munipack/devel/munipack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- munipack.spec	25 Jul 2009 15:25:18 -0000	1.6
+++ munipack.spec	28 May 2010 21:45:02 -0000	1.7
@@ -1,16 +1,16 @@
 Name:		munipack
-Version:	1.1.24
-Release:	3%{?dist}
-Summary:	The C-Munipack is an astrophotometry software package
+Version:	1.2.10
+Release:	1%{?dist}
+Summary:	An astrophotometry software package
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://c-munipack.sourceforge.net/
 Source0:	http://dl.sf.net/%{name}/c%{name}-%{version}.tar.gz
-
+Source1:	muniwin.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	cfitsio-devel, expat-devel
-Requires:	cfitsio
-Provides:	cmunipack
+BuildRequires:	cfitsio-devel, expat-devel, gtk2-devel
+BuildRequires:	desktop-file-utils
+Provides:	cmunipack = %{version}-%{release}
 
 %description
 The C-Munipack is an astrophotometry software package,
@@ -31,13 +31,22 @@ Libraries/include files for cmunipack
 %setup -q -n c%{name}-%{version}
 
 %build
-export CFLAGS="-I/usr/include/cfitsio %{optflags}" 
-%configure 
+export CFLAGS="-I/usr/include/cfitsio %{optflags}" CXXFLAGS="-I/usr/include/cfitsio %{optflags}"
+%configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+pushd $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -s ../cmunipack-1.2/icons/muniwin.png .
+popd
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,26 +66,33 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/muniphot
 %{_bindir}/munimatch
 %{_bindir}/meandark
-%{_bindir}/munifind
 %{_bindir}/biasbat
 %{_bindir}/airmass
 %{_bindir}/timebat
 %{_bindir}/autoflat
 %{_bindir}/kombine
 %{_bindir}/darkbat
-%{_libdir}/libcmunipack.so.*
-%{_datadir}/c%{name}
+%{_bindir}/muniwin
+%{_libdir}/libcmunipack*.so.*
+%{_datadir}/c%{name}*/
+%{_datadir}/applications/muniwin.desktop
+%{_datadir}/pixmaps/muniwin.png
 %{_mandir}/man1/*.1*
+%{_mandir}/man3/*.3*
 
 %files devel
 %defattr(-,root,root,-)
-%exclude %{_libdir}/libcmunipack.la
-%{_libdir}/libcmunipack.a
-%{_libdir}/libcmunipack.so
-%{_includedir}/cmunipack.h
-
+%{_libdir}/libcmunipack*.so
+%{_includedir}/cmunipack-1.2/
+%{_libdir}/pkgconfig/cmunipack-1.2.pc
 
 %changelog
+* Fri May 28 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.10-1
+- update to 1.2.10
+- disable static libs
+- disable rpath
+- add desktop file for muniwin
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.24-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/munipack/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jun 2008 17:34:47 -0000	1.3
+++ sources	28 May 2010 21:45:02 -0000	1.4
@@ -1 +1 @@
-9a05e8a33a09e49b5bb36def5afb4636  cmunipack-1.1.24.tar.gz
+bb04d354c371fb337bc4c55d08366d7c  cmunipack-1.2.10.tar.gz