Attachment 2789 Details for Bug 7450 – Diff for spec files

[patch] Diff for spec files

diff.txt (text/plain), 7.58 KB, created by Alex Loginov on 2012-09-12 09:43:06 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Loginov

Created: 2012-09-12 09:43:06 CEST

Size: 7.58 KB

patch

obsolete

>--- ./lazarus_orig.spec	2012-09-12 11:35:15.667190418 +0400
>+++ ./lazarus.spec	2012-09-12 11:35:37.397190737 +0400
>@@ -1,31 +1,41 @@
>+%define ver 1.0.1
>+%define snapshot 38517
>+%define reldate 20120905
>+
> Name:           lazarus
>-Version:        0.9.30.4
>-Release:        %mkrel 2
>+Version:        %{ver}.%{reldate}
>+Release:        4
> Summary:        Lazarus Component Library and IDE for Freepascal
> Group:          Development/Other
> # GNU Classpath style exception, see COPYING.modifiedLGPL
> License:        GPLv2+ and MPLv1.1 and LGPLv2+ with exceptions
> URL:            http://www.lazarus.freepascal.org/
>-Source0:	http://sourceforge.net/projects/%{name}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20%{version}/%{name}-%{version}-src.tar.bz2
>+Source0:        http://www.hu.freepascal.org/%{name}/%{name}-%{ver}-%{snapshot}-%{reldate}-src.tar.bz2
> patch1:         Desktop_patch.diff
>+BuildRoot:      %{_tmppath}/%{name}-%{ver}.%{snapshot}-%{release}-root
> 
>-BuildRequires: fpc-src >= 2.4.2
>-BuildRequires: fpc >= 2.4.2
>-BuildRequires: pkgconfig(gdk-pixbuf-2.0)
>-BuildRequires: pkgconfig(gtk+-2.0)
>-BuildRequires: glibc
>-BuildRequires: gdb
>-BuildRequires: pkgconfig(glib-2.0)
>-BuildRequires: pkgconfig(gdk-pixbuf-2.0)
>-BuildRequires: desktop-file-utils
>-Requires: fpc-src >= 2.4.2
>-Requires: fpc >= 2.4.2
>-Requires: pkgconfig(gtk+-2.0)
>-Requires: pkgconfig(gdk-pixbuf-2.0)
>-Requires: gdb
>-Requires: pkgconfig(glib-2.0)
>-Requires: binutils
>-Requires: glibc-devel
>+BuildRequires:	fpc-src >= 2.6.0
>+BuildRequires:	fpc >= 2.6.0
>+BuildRequires:	gdk-pixbuf
>+BuildRequires:	gtk+
>+BuildRequires:	glibc
>+BuildRequires:	gdb
>+BuildRequires:	glib-devel
>+BuildRequires:	gdk-pixbuf-devel
>+BuildRequires:	gtk2-devel
>+BuildRequires:	desktop-file-utils
>+Requires:	fpc-src >= 2.6.0
>+Requires:	fpc >= 2.6.0
>+Requires:	gdk-pixbuf
>+Requires:	gtk+
>+Requires:	glibc
>+Requires:	gdb
>+Requires:	glib-devel
>+Requires:	gdk-pixbuf-devel
>+Requires:	binutils
>+Requires:	gtk2-devel
>+Requires:	glibc-devel
>+Requires:	jpeg-devel
> 
> %description
> Lazarus is a free and opensource RAD tool for freepascal using the lazarus
>@@ -55,18 +65,23 @@
> 
> export FPCDIR=%{_datadir}/fpcsrc/
> fpcmake -Tall
>-make tools OPT='-gl'
>-make bigide OPT='-gl'
>-make lazbuilder OPT='-gl'
>+
>+MAKEOPTS="-gl -gw -Fl/usr/%{_lib}"
>+
>+make bigide OPT="$MAKEOPTS"
>+make tools OPT="$MAKEOPTS"
>+make lazbuild OPT="$MAKEOPTS"
>+
> # Add the ability to create gtk2-applications
> export LCL_PLATFORM=gtk2
>-make lcl ideintf packager/registration bigidecomponents OPT='-gl'
>+make packager/registration lazutils lcl ideintf codetools bigidecomponents OPT='-gl -gw'
> export LCL_PLATFORM=
> strip lazarus
> strip startlazarus
> strip lazbuild
> 
> %install
>+rm -rf %{buildroot}
> LAZARUSDIR=%{_libdir}/%{name}
> mkdir -p %{buildroot}$LAZARUSDIR
> mkdir -p %{buildroot}%{_bindir}
>@@ -76,17 +91,24 @@
> mkdir -p %{buildroot}%{_mandir}/man1
> mkdir -p %{buildroot}%{_sysconfdir}/lazarus
> cp -a lazarus/* %{buildroot}$LAZARUSDIR/
>-install -m 644 lazarus/images/ide_icon48x48.png %{buildroot}%{_datadir}/pixmaps/lazarus.png
>-install -m 644 lazarus/install/lazarus.desktop %{buildroot}%{_datadir}/applications/lazarus.desktop
>-install -m 644 lazarus/install/lazarus-mime.xml $LazBuildDir%{buildroot}%{_datadir}/mime/packages/lazarus.xml
>+  install -m 644 lazarus/images/ide_icon48x48.png %{buildroot}%{_datadir}/pixmaps/lazarus.png
>+  install -m 644 lazarus/install/lazarus.desktop %{buildroot}%{_datadir}/applications/lazarus.desktop
>+  install -m 644 lazarus/install/lazarus-mime.xml $LazBuildDir%{buildroot}%{_datadir}/mime/packages/lazarus.xml
> ln -sf $LAZARUSDIR/lazarus %{buildroot}%{_bindir}/lazarus-ide
> ln -sf $LAZARUSDIR/startlazarus %{buildroot}%{_bindir}/startlazarus
> ln -sf $LAZARUSDIR/lazbuild %{buildroot}%{_bindir}/lazbuild
> cat lazarus/install/man/man1/lazbuild.1 | gzip > %{buildroot}%{_mandir}/man1/lazbuild.1.gz
> cat lazarus/install/man/man1/lazarus-ide.1 | gzip > %{buildroot}%{_mandir}/man1/lazarus-ide.1.gz
> cat lazarus/install/man/man1/startlazarus.1 | gzip > %{buildroot}%{_mandir}/man1/startlazarus.1.gz
>-install lazarus/tools/install/linux/editoroptions.xml %{buildroot}%{_sysconfdir}/lazarus/editoroptions.xml
>-sed 's#__LAZARUSDIR__#%{_libdir}/%{name}#;s#__FPCSRCDIR__#%{_datadir}/fpcsrc#' lazarus/tools/install/linux/environmentoptions.xml > %{buildroot}%{_sysconfdir}/lazarus/environmentoptions.xml
>+  install lazarus/tools/install/linux/editoroptions.xml %{buildroot}%{_sysconfdir}/lazarus/editoroptions.xml
>+# fix fpc and lazarus path  
>+install lazarus/tools/install/linux/environmentoptions.xml %{buildroot}%{_sysconfdir}/lazarus/environmentoptions.xml
>+sed -i 's/\$(FPCVER)\///g' %{buildroot}%{_sysconfdir}/lazarus/environmentoptions.xml
>+sed -i 's/%LazarusVersion%//g' %{buildroot}%{_sysconfdir}/lazarus/environmentoptions.xml
>+
>+#Fix config path (akdengi)
>+sed -i 's#__LAZARUSDIR__#'$LAZARUSDIR'#g' %{buildroot}%{_sysconfdir}/lazarus/environmentoptions.xml
>+sed -i 's#__FPCSRCDIR__#'$FPCDIR'#g' %{buildroot}%{_sysconfdir}/lazarus/environmentoptions.xml
> 
> chmod 755 %{buildroot}%{_libdir}/%{name}/components/lazreport/tools/localize.sh
> 
>@@ -99,7 +121,11 @@
> rm -rf install
> popd
> 
>+%post
>+%{_libdir}/%{name}/tools/install/rpm/create_gtk1_links.sh
>+
> %files
>+%defattr(-,root,root,-)
> %doc lazarus/COPYING* lazarus/README.txt
> %{_libdir}/%{name}
> %{_bindir}/%{name}-ide
>@@ -114,68 +140,18 @@
> %{_mandir}/*/*
> 
> 
>-%changelog
>-
>-* Wed Jul 18 2012 dams <dams> 0.9.30.4-2.mga3
>-+ Revision: 272298
>-- fix 'environmentoptions.xml' to fix build of packages via lazarus
>-
>-* Fri Apr 20 2012 remmy <remmy> 0.9.30.4-1.mga2
>-+ Revision: 232175
>-- Switched to latest stable release
>-- Lazarus now actually shows something different from blank windows (mga#4756, mga#1606)
>-
>-* Sun Sep 04 2011 ovitters <ovitters> 0.9.30.1.30881-1.mga2
>-+ Revision: 138437
>-- clean buildrequires
>-  fix environmentoptions.xml to avoid errors on startup
>-- clean spec file
>-- imported package lazarus
>-
>-
>-* Tue May 24 2011 ÐÐ»ÐµÐºÑÐ°Ð½Ð´Ñ ÐÐ°Ð·Ð°Ð½ÑÐµÐ² <kazancas@mandriva.org> 0.9.30.1.30881-1mdv2011.0
>-+ Revision: 678181
>-- svn fix version for new fpc 2.4.4
>-
>-* Mon Mar 28 2011 ÐÐ»ÐµÐºÑÐ°Ð½Ð´Ñ ÐÐ°Ð·Ð°Ð½ÑÐµÐ² <kazancas@mandriva.org> 0.9.30.1.30041-1
>-+ Revision: 648700
>-- new release 0.9.30 (fix snapshot)
>-
>-* Wed Jan 26 2011 ÐÐ»ÐµÐºÑÐ°Ð½Ð´Ñ ÐÐ°Ð·Ð°Ð½ÑÐµÐ² <kazancas@mandriva.org> 0.9.29.29190-1
>-+ Revision: 633048
>--update to 0.9.29-29190 fix snapshot
>-
>-* Mon Dec 27 2010 ÐÐ»ÐµÐºÑÐ°Ð½Ð´Ñ ÐÐ°Ð·Ð°Ð½ÑÐµÐ² <kazancas@mandriva.org> 0.9.29.27705-1mdv2011.0
>-+ Revision: 625490
>-+ rebuild (emptylog)
>-
>-* Mon Dec 06 2010 Oden Eriksson <oeriksson@mandriva.com> 0.9.28.2-5mdv2011.0
>-+ Revision: 612703
>-- the mass rebuild of 2010.1 packages
>-
>-* Fri Jan 29 2010 JÃ©rÃ´me Brenier <incubusss@mandriva.org> 0.9.28.2-4mdv2010.1
>-+ Revision: 497877
>-- Requires: make
>-
>-* Thu Dec 03 2009 JÃ©rÃ´me Brenier <incubusss@mandriva.org> 0.9.28.2-3mdv2010.1
>-+ Revision: 472753
>-- bump release
>-- fix both environmentoptions.xml files
>-
>-* Wed Dec 02 2009 JÃ©rÃ´me Brenier <incubusss@mandriva.org> 0.9.28.2-2mdv2010.1
>-+ Revision: 472717
>-- fix environmentoptions.xml
>-
>-* Wed Dec 02 2009 JÃ©rÃ´me Brenier <incubusss@mandriva.org> 0.9.28.2-1mdv2010.1
>-+ Revision: 472695
>-- version 0.9.8.2
>-- fix BuildRequires / Requires
>-- fix desktop file
>-- remove some duplicates and useless files
>-- fix %%files section
>-
>-  + Funda Wang <fwang@mandriva.org>
>-    - sync with fedora's patckage
>-    - import lazarus
>-
> 
>+%changelog
>+* Thu Sep  6 2012 akdengi <kazancas@mandriva.ru>
>++ Commit: 1eadc6e
>+- -fix enviroment config values
>+  
>+* Thu Sep  6 2012 akdengi <kazancas@mandriva.ru>
>++ Commit: 12afe0d
>+- -use DWARF debuginfo instead STUBS
>+  
>+* Thu Sep  6 2012 akdengi <kazancas@mandriva.ru>
>++ Commit: db6c188
>+- -new version 1.0.1
>+  
>+

--- ./lazarus_orig.spec	2012-09-12 11:35:15.667190418 +0400
+++ ./lazarus.spec	2012-09-12 11:35:37.397190737 +0400
@@ -1,31 +1,41 @@
+%define ver 1.0.1
+%define snapshot 38517
+%define reldate 20120905
+
 Name:           lazarus
-Version:        0.9.30.4
-Release:        %mkrel 2
+Version:        %{ver}.%{reldate}
+Release:        4
 Summary:        Lazarus Component Library and IDE for Freepascal
 Group:          Development/Other
 # GNU Classpath style exception, see COPYING.modifiedLGPL
 License:        GPLv2+ and MPLv1.1 and LGPLv2+ with exceptions
 URL:            http://www.lazarus.freepascal.org/
-Source0:	http://sourceforge.net/projects/%{name}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20%{version}/%{name}-%{version}-src.tar.bz2
+Source0:        http://www.hu.freepascal.org/%{name}/%{name}-%{ver}-%{snapshot}-%{reldate}-src.tar.bz2
 patch1:         Desktop_patch.diff
+BuildRoot:      %{_tmppath}/%{name}-%{ver}.%{snapshot}-%{release}-root
 
-BuildRequires: fpc-src >= 2.4.2
-BuildRequires: fpc >= 2.4.2
-BuildRequires: pkgconfig(gdk-pixbuf-2.0)
-BuildRequires: pkgconfig(gtk+-2.0)
-BuildRequires: glibc
-BuildRequires: gdb
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(gdk-pixbuf-2.0)
-BuildRequires: desktop-file-utils
-Requires: fpc-src >= 2.4.2
-Requires: fpc >= 2.4.2
-Requires: pkgconfig(gtk+-2.0)
-Requires: pkgconfig(gdk-pixbuf-2.0)
-Requires: gdb
-Requires: pkgconfig(glib-2.0)
-Requires: binutils
-Requires: glibc-devel
+BuildRequires:	fpc-src >= 2.6.0
+BuildRequires:	fpc >= 2.6.0
+BuildRequires:	gdk-pixbuf
+BuildRequires:	gtk+
+BuildRequires:	glibc
+BuildRequires:	gdb
+BuildRequires:	glib-devel
+BuildRequires:	gdk-pixbuf-devel
+BuildRequires:	gtk2-devel
+BuildRequires:	desktop-file-utils
+Requires:	fpc-src >= 2.6.0
+Requires:	fpc >= 2.6.0
+Requires:	gdk-pixbuf
+Requires:	gtk+
+Requires:	glibc
+Requires:	gdb
+Requires:	glib-devel
+Requires:	gdk-pixbuf-devel
+Requires:	binutils
+Requires:	gtk2-devel
+Requires:	glibc-devel
+Requires:	jpeg-devel
 
 %description
 Lazarus is a free and opensource RAD tool for freepascal using the lazarus
@@ -55,18 +65,23 @@
 
 export FPCDIR=%{_datadir}/fpcsrc/
 fpcmake -Tall
-make tools OPT='-gl'
-make bigide OPT='-gl'
-make lazbuilder OPT='-gl'
+
+MAKEOPTS="-gl -gw -Fl/usr/%{_lib}"
+
+make bigide OPT="$MAKEOPTS"
+make tools OPT="$MAKEOPTS"
+make lazbuild OPT="$MAKEOPTS"
+
 # Add the ability to create gtk2-applications
 export LCL_PLATFORM=gtk2
-make lcl ideintf packager/registration bigidecomponents OPT='-gl'
+make packager/registration lazutils lcl ideintf codetools bigidecomponents OPT='-gl -gw'
 export LCL_PLATFORM=
 strip lazarus
 strip startlazarus
 strip lazbuild
 
 %install
+rm -rf %{buildroot}
 LAZARUSDIR=%{_libdir}/%{name}
 mkdir -p %{buildroot}$LAZARUSDIR
 mkdir -p %{buildroot}%{_bindir}
@@ -76,17 +91,24 @@
 mkdir -p %{buildroot}%{_mandir}/man1
 mkdir -p %{buildroot}%{_sysconfdir}/lazarus
 cp -a lazarus/* %{buildroot}$LAZARUSDIR/
-install -m 644 lazarus/images/ide_icon48x48.png %{buildroot}%{_datadir}/pixmaps/lazarus.png
-install -m 644 lazarus/install/lazarus.desktop %{buildroot}%{_datadir}/applications/lazarus.desktop
-install -m 644 lazarus/install/lazarus-mime.xml $LazBuildDir%{buildroot}%{_datadir}/mime/packages/lazarus.xml
+  install -m 644 lazarus/images/ide_icon48x48.png %{buildroot}%{_datadir}/pixmaps/lazarus.png
+  install -m 644 lazarus/install/lazarus.desktop %{buildroot}%{_datadir}/applications/lazarus.desktop
+  install -m 644 lazarus/install/lazarus-mime.xml $LazBuildDir%{buildroot}%{_datadir}/mime/packages/lazarus.xml
 ln -sf $LAZARUSDIR/lazarus %{buildroot}%{_bindir}/lazarus-ide
 ln -sf $LAZARUSDIR/startlazarus %{buildroot}%{_bindir}/startlazarus
 ln -sf $LAZARUSDIR/lazbuild %{buildroot}%{_bindir}/lazbuild
 cat lazarus/install/man/man1/lazbuild.1 | gzip > %{buildroot}%{_mandir}/man1/lazbuild.1.gz
 cat lazarus/install/man/man1/lazarus-ide.1 | gzip > %{buildroot}%{_mandir}/man1/lazarus-ide.1.gz
 cat lazarus/install/man/man1/startlazarus.1 | gzip > %{buildroot}%{_mandir}/man1/startlazarus.1.gz
-install lazarus/tools/install/linux/editoroptions.xml %{buildroot}%{_sysconfdir}/lazarus/editoroptions.xml
-sed 's#__LAZARUSDIR__#%{_libdir}/%{name}#;s#__FPCSRCDIR__#%{_datadir}/fpcsrc#' lazarus/tools/install/linux/environmentoptions.xml > %{buildroot}%{_sysconfdir}/lazarus/environmentoptions.xml
+  install lazarus/tools/install/linux/editoroptions.xml %{buildroot}%{_sysconfdir}/lazarus/editoroptions.xml
+# fix fpc and lazarus path  
+install lazarus/tools/install/linux/environmentoptions.xml %{buildroot}%{_sysconfdir}/lazarus/environmentoptions.xml
+sed -i 's/\$(FPCVER)\///g' %{buildroot}%{_sysconfdir}/lazarus/environmentoptions.xml
+sed -i 's/%LazarusVersion%//g' %{buildroot}%{_sysconfdir}/lazarus/environmentoptions.xml
+
+#Fix config path (akdengi)
+sed -i 's#__LAZARUSDIR__#'$LAZARUSDIR'#g' %{buildroot}%{_sysconfdir}/lazarus/environmentoptions.xml
+sed -i 's#__FPCSRCDIR__#'$FPCDIR'#g' %{buildroot}%{_sysconfdir}/lazarus/environmentoptions.xml
 
 chmod 755 %{buildroot}%{_libdir}/%{name}/components/lazreport/tools/localize.sh
 
@@ -99,7 +121,11 @@
 rm -rf install
 popd
 
+%post
+%{_libdir}/%{name}/tools/install/rpm/create_gtk1_links.sh
+
 %files
+%defattr(-,root,root,-)
 %doc lazarus/COPYING* lazarus/README.txt
 %{_libdir}/%{name}
 %{_bindir}/%{name}-ide
@@ -114,68 +140,18 @@
 %{_mandir}/*/*
 
 
-%changelog
-
-* Wed Jul 18 2012 dams <dams> 0.9.30.4-2.mga3
-+ Revision: 272298
-- fix 'environmentoptions.xml' to fix build of packages via lazarus
-
-* Fri Apr 20 2012 remmy <remmy> 0.9.30.4-1.mga2
-+ Revision: 232175
-- Switched to latest stable release
-- Lazarus now actually shows something different from blank windows (mga#4756, mga#1606)
-
-* Sun Sep 04 2011 ovitters <ovitters> 0.9.30.1.30881-1.mga2
-+ Revision: 138437
-- clean buildrequires
-  fix environmentoptions.xml to avoid errors on startup
-- clean spec file
-- imported package lazarus
-
-
-* Tue May 24 2011 ÐÐ»ÐµÐºÑÐ°Ð½Ð´Ñ ÐÐ°Ð·Ð°Ð½ÑÐµÐ² <kazancas@mandriva.org> 0.9.30.1.30881-1mdv2011.0
-+ Revision: 678181
-- svn fix version for new fpc 2.4.4
-
-* Mon Mar 28 2011 ÐÐ»ÐµÐºÑÐ°Ð½Ð´Ñ ÐÐ°Ð·Ð°Ð½ÑÐµÐ² <kazancas@mandriva.org> 0.9.30.1.30041-1
-+ Revision: 648700
-- new release 0.9.30 (fix snapshot)
-
-* Wed Jan 26 2011 ÐÐ»ÐµÐºÑÐ°Ð½Ð´Ñ ÐÐ°Ð·Ð°Ð½ÑÐµÐ² <kazancas@mandriva.org> 0.9.29.29190-1
-+ Revision: 633048
--update to 0.9.29-29190 fix snapshot
-
-* Mon Dec 27 2010 ÐÐ»ÐµÐºÑÐ°Ð½Ð´Ñ ÐÐ°Ð·Ð°Ð½ÑÐµÐ² <kazancas@mandriva.org> 0.9.29.27705-1mdv2011.0
-+ Revision: 625490
-+ rebuild (emptylog)
-
-* Mon Dec 06 2010 Oden Eriksson <oeriksson@mandriva.com> 0.9.28.2-5mdv2011.0
-+ Revision: 612703
-- the mass rebuild of 2010.1 packages
-
-* Fri Jan 29 2010 JÃ©rÃ´me Brenier <incubusss@mandriva.org> 0.9.28.2-4mdv2010.1
-+ Revision: 497877
-- Requires: make
-
-* Thu Dec 03 2009 JÃ©rÃ´me Brenier <incubusss@mandriva.org> 0.9.28.2-3mdv2010.1
-+ Revision: 472753
-- bump release
-- fix both environmentoptions.xml files
-
-* Wed Dec 02 2009 JÃ©rÃ´me Brenier <incubusss@mandriva.org> 0.9.28.2-2mdv2010.1
-+ Revision: 472717
-- fix environmentoptions.xml
-
-* Wed Dec 02 2009 JÃ©rÃ´me Brenier <incubusss@mandriva.org> 0.9.28.2-1mdv2010.1
-+ Revision: 472695
-- version 0.9.8.2
-- fix BuildRequires / Requires
-- fix desktop file
-- remove some duplicates and useless files
-- fix %%files section
-
-  + Funda Wang <fwang@mandriva.org>
-    - sync with fedora's patckage
-    - import lazarus
-
 
+%changelog
+* Thu Sep  6 2012 akdengi <kazancas@mandriva.ru>
++ Commit: 1eadc6e
+- -fix enviroment config values
+  
+* Thu Sep  6 2012 akdengi <kazancas@mandriva.ru>
++ Commit: 12afe0d
+- -use DWARF debuginfo instead STUBS
+  
+* Thu Sep  6 2012 akdengi <kazancas@mandriva.ru>
++ Commit: db6c188
+- -new version 1.0.1
+  
+

Actions: View | Diff

Attachments on bug 7450: 2785 | 2786 | 2789