rpms/isomaster/devel isomaster-0.7-dep.diff, NONE, 1.1 isomaster-0.7-manpath.diff, NONE, 1.1 isomaster-0.7-optflags.diff, NONE, 1.1 isomaster.desktop, NONE, 1.1 isomaster.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Marcin Zajaczkowski (szpak)
fedora-extras-commits at redhat.com
Mon Jan 22 19:16:30 UTC 2007
Author: szpak
Update of /cvs/extras/rpms/isomaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9710/devel
Modified Files:
.cvsignore sources
Added Files:
isomaster-0.7-dep.diff isomaster-0.7-manpath.diff
isomaster-0.7-optflags.diff isomaster.desktop isomaster.spec
Log Message:
auto-import isomaster-0.7-2.fc5 on branch devel from isomaster-0.7-2.src.rpm
isomaster-0.7-dep.diff:
--- NEW FILE isomaster-0.7-dep.diff ---
--- isomaster-0.7/Makefile 2007-01-12 01:37:43.000000000 +0100
+++ isomaster-0.7/Makefile.dep 2007-01-13 12:15:46.098745896 +0100
@@ -49,7 +49,7 @@
all: lib iniparser translations isomaster man
-isomaster: $(OBJECTS) bk/bk.a iniparser-2.15/libiniparser.a
+isomaster: $(OBJECTS) lib iniparser
$(CC) $(OBJECTS) bk/bk.a iniparser-2.15/libiniparser.a $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0`-o isomaster
# static pattern rule
isomaster-0.7-manpath.diff:
--- NEW FILE isomaster-0.7-manpath.diff ---
--- isomaster-0.7/Makefile 2007-01-12 01:37:43.000000000 +0100
+++ isomaster-0.7/Makefile.man 2007-01-13 11:44:05.118652488 +0100
@@ -22,7 +22,7 @@
# where to install the man page
ifndef MYMANPATH
- MYMANPATH = $(PREFIX)/man/man1
+ MYMANPATH = $(PREFIX)/share/man/man1
endif
# To disable i18n completely, uncomment the following line
isomaster-0.7-optflags.diff:
--- NEW FILE isomaster-0.7-optflags.diff ---
--- isomaster-0.7/Makefile 2007-01-12 01:37:43.000000000 +0100
+++ isomaster-0.7/Makefile.opt 2007-01-13 11:26:40.353989876 +0100
@@ -37,7 +37,7 @@
export INSTALL = install
# -DDEBUG and -g only used during development
-CFLAGS = -Wall -pedantic -std=c99 `pkg-config --cflags gtk+-2.0` -DICONPATH=\"$(ICONPATH)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
+CFLAGS = ${OPTFLAGS} -pedantic -std=c99 `pkg-config --cflags gtk+-2.0` -DICONPATH=\"$(ICONPATH)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
ifndef WITHOUT_NLS
CFLAGS += -DENABLE_NLS
endif
--- isomaster-0.7/bk/Makefile 2007-01-08 01:08:02.000000000 +0100
+++ isomaster-0.7/bk/Makefile.opt 2007-01-13 11:27:22.181851954 +0100
@@ -3,7 +3,7 @@
OBJECTS = bkRead7x.o bkAdd.o bkDelete.o bkExtract.o bkRead.o bkPath.o bkMangle.o bkWrite.o bkWrite7x.o bkTime.o bkSort.o bkError.o bkGet.o bkSet.o bkCache.o
# -DDEBUG and -g only used during development
-CFLAGS = -Wall -pedantic -std=c99
+CFLAGS = ${OPTFLAGS} -pedantic -std=c99
# the _FILE_OFFSET_BITS=64 is to enable stat() for large files
CPPFLAGS = -D_FILE_OFFSET_BITS=64
--- isomaster-0.7/iniparser-2.15/Makefile 2006-12-15 07:03:08.000000000 +0100
+++ isomaster-0.7/iniparser-2.15/Makefile.opt 2007-01-13 11:27:59.044689549 +0100
@@ -4,6 +4,7 @@
# Compiler settings
# CFLAGS = -O3 -pedantic -std=c99
+CFLAGS = ${OPTFLAGS} -pedantic -std=c99
# Ar settings to build the library
ARFLAGS = rcv
--- NEW FILE isomaster.desktop ---
[Desktop Entry]
Name=ISO Master
Comment=An easy to use GUI CD image editor
Exec=isomaster
Encoding=UTF-8
Terminal=false
Icon=/usr/share/isomaster/icons/isomaster.png
Type=Application
StartupNotify=true
Categories=Utility;
--- NEW FILE isomaster.spec ---
Name: isomaster
Summary: An easy to use GUI CD image editor
Version: 0.7
Release: 2%{?dist}
License: GPL
Group: Applications/File
URL: http://littlesvr.ca/isomaster/
#moved to .rpmmacros
#Packager: Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
Source0: http://littlesvr.ca/isomaster/releases/isomaster-%{version}.tar.bz2
Source1: isomaster.desktop
#using %%{optflags}
Patch0: isomaster-0.7-optflags.diff
#using proper path for man
Patch1: isomaster-0.7-manpath.diff
#correcting wrong dependencies which broke parallel build
Patch2: isomaster-0.7-dep.diff
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#author is not sure about version, but 2.8 should be enough
#removed because libgdk-x11-2.0.so.0 already forces gtk+
#Requires: gtk2
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
%description
ISO Master: an easy to use GUI CD image editor.
It allows to extract files from an ISO, add files to an ISO,
and create bootable ISOs - all in a graphical user interface.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
#PREFIX is required to specify a correct dir for icons
make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}"
%install
rm -fr %{buildroot}
make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
%find_lang %{name}
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
%clean
rm -fr %{buildroot}
%files -f %{name}.lang
%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_bindir}/isomaster
%{_datadir}/%{name}
%doc CHANGELOG.TXT CREDITS.TXT LICENCE.TXT README.TXT
%{_datadir}/applications/*.desktop
%{_mandir}/man1/isomaster.1*
%changelog
* Wed Jan 17 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.7-2
- removed deprecated Application category from a .desktop file
- man page mapping changed to more universal
* Fri Jan 12 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.7-1
- updated to 0.7
- added locale files
- added a manual page
- adjusted %%{optflags} patch to a new Makefile
- added patch to correct wrong dependencies which broke a parallel build
- removed redundant deletion of builddir (--clean option in rpmbuild does the same)
* Mon Jan 8 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.6-6
- applied suggestions from Michael Schwendt
- menu category changed to "Application;Utility;"
- added patch to use %%{optflags}
* Sat Dec 30 2006 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.6-5
- description broke down into 3 lines
- gtk+ removed from Requires, because libgdk-x11-2.0.so.0 already forces it
* Sat Dec 30 2006 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.6-4
- isomaster.desktop in a non gzipped form
- corrected path in a desktop file
* Fri Dec 29 2006 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.6-3
- applied suggestions from Michal Bentkowski (below)
- fixed problem with remaining %%{_datadir}/%%{name} directory
- desktop-file-utils moved to BuildRequires
- removed minimal required version of GTK+
- .desktop file available as an another source
* Fri Dec 29 2006 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.6-2
- started adaptation to Fedora Extras requirements
- Packager tag removed from .spec file (now only in .rpmmacros)
- gcc-c++ removed from BuildRequires section
- vendor changed to "fedora"
- minimal required version of GTK+ added
* Sun Dec 10 2006 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.6-1
- updated to 0.6
- changed icons names
* Sun Oct 29 2006 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.5-1
- updated to 0.5
* Wed Sep 28 2006 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.4-1
- updated to 0.4
- removed patch for Makefile (my suggestions was included in the original release)
* Tue Sep 26 2006 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.3-2
- tests with new Makefile
* Sun Sep 24 2006 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.3-1
- initial release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isomaster/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jan 2007 19:13:15 -0000 1.1
+++ .cvsignore 22 Jan 2007 19:16:00 -0000 1.2
@@ -0,0 +1 @@
+isomaster-0.7.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isomaster/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jan 2007 19:13:15 -0000 1.1
+++ sources 22 Jan 2007 19:16:00 -0000 1.2
@@ -0,0 +1 @@
+ecc0a033211bb61c18a0bdde5612f2c9 isomaster-0.7.tar.bz2
More information about the scm-commits
mailing list