Revision: 2109 http://geany.svn.sourceforge.net/geany/?rev=2109&view=rev Author: eht16 Date: 2007-12-18 08:30:57 -0800 (Tue, 18 Dec 2007)
Log Message: ----------- Don't install pixmaps/geany.ico by default. Fix mandir path and don't delete icons (patch by Yura Siamashka, thanks).
Modified Paths: -------------- trunk/ChangeLog trunk/Makefile.am trunk/geany.spec.in
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-12-18 13:35:51 UTC (rev 2108) +++ trunk/ChangeLog 2007-12-18 16:30:57 UTC (rev 2109) @@ -1,3 +1,10 @@ +2007-12-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * Makefile.am: Don't install pixmaps/geany.ico by default. + * geany.spec.in: Fix mandir path and don't delete icons + (patch by Yura Siamashka, thanks). + + 2007-12-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* tagmanager/c.c:
Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2007-12-18 13:35:51 UTC (rev 2108) +++ trunk/Makefile.am 2007-12-18 16:30:57 UTC (rev 2109) @@ -50,11 +50,7 @@ @$(NORMAL_INSTALL) if test -d $(srcdir)/pixmaps; then \ $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps; \ - for pixmap in $(srcdir)/pixmaps/*; do \ - if test -f $$pixmap; then \ - $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps; \ - fi \ - done \ + $(INSTALL_DATA) pixmaps/geany.png $(DESTDIR)$(datadir)/pixmaps; \ fi $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \ $(INSTALL_DATA) $(srcdir)/data/global.tags $(DESTDIR)$(pkgdatadir); \
Modified: trunk/geany.spec.in =================================================================== --- trunk/geany.spec.in 2007-12-18 13:35:51 UTC (rev 2108) +++ trunk/geany.spec.in 2007-12-18 16:30:57 UTC (rev 2109) @@ -34,7 +34,7 @@ %install %__rm -Rf $RPM_BUILD_ROOT %makeinstall -%__rm -Rf $RPM_BUILD_ROOT%{_datadir}/icons/ +%__rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache %__rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.ico
%clean @@ -50,5 +50,5 @@ %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo %{_datadir}/pixmaps/%{name}.png %{_datadir}/doc/%{name}/ -%{_datadir}/man/man1/%{name}.1.gz +%{_mandir}/man1/%{name}.1.gz %{_datadir}/icons/hicolor/16x16/apps/classviewer-*.png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.