Author: visnov Date: Tue Oct 4 15:14:17 2011 New Revision: 66231 URL: http://svn.opensuse.org/viewcvs/yast?rev=66231&view=rev Log: drop Prefix: thingy Modified: trunk/devtools/devtools/bin/create-spec trunk/devtools/package/yast2-devtools.changes trunk/devtools/yast2-devtools.spec.in Modified: trunk/devtools/devtools/bin/create-spec URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/create-spec?rev=66231&r1=66230&r2=66231&view=diff ============================================================================== --- trunk/devtools/devtools/bin/create-spec (original) +++ trunk/devtools/devtools/bin/create-spec Tue Oct 4 15:14:17 2011 @@ -128,7 +128,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: $RPMNAME-%{version}.tar.bz2 -Prefix: /usr $provides_locale", "\@HEADER-DEVEL\@" => @@ -151,30 +150,30 @@ "\@BUILD\@" => "$DEFAULTBUILDTAG -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS=\"\$RPM_OPT_FLAGS -DNDEBUG\" export CXXFLAGS=\"\$RPM_OPT_FLAGS -DNDEBUG\" \%{?suse_update_config:\%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1", "\@BUILD-QT\@" => "$DEFAULTBUILDTAG -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS=\"\$RPM_OPT_FLAGS -DNDEBUG\" export CXXFLAGS=\"\$RPM_OPT_FLAGS -DNDEBUG\" \%{?suse_update_config:\%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/%{_lib} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/%{_lib} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1", @@ -183,7 +182,7 @@ "$DEFAULTBUILDTAG autoreconf --force --install \%{?suse_update_config:\%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} +./configure --libdir=%{_libdir} --prefix=%{_prefix} make %{?jobs:-j%jobs}", ##### INSTALL ##### @@ -191,7 +190,7 @@ "\@INSTALL\@" => "\%install make install DESTDIR=\"\$RPM_BUILD_ROOT\" -[ -e \"%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK\" ] || Y2DIR=\"\$RPM_BUILD_ROOT$yast2dir\" make check DESTDIR=\"\$RPM_BUILD_ROOT\" +[ -e \"%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK\" ] || Y2DIR=\"\$RPM_BUILD_ROOT$yast2dir\" make check DESTDIR=\"\$RPM_BUILD_ROOT\" for f in `find \$RPM_BUILD_ROOT/\@desktopdir\@/ -name \"*.desktop\"` ; do d=\${f##*/} \%suse_update_desktop_file -d ycc_\${d\%.desktop} \${d\%.desktop} @@ -218,20 +217,20 @@ # and use it here. (cannot use configure directly because # makefile has ${prefix} and spec file has %{prefix} # FIXME: $prefix unfunctional - #"\@yast2dir@" => "\\\${prefix}/share/YaST2", + #"\@yast2dir@" => "\\\${_prefix}/share/YaST2", "\@pkgconfigdir\@" => "%{_libdir}/pkgconfig", - "\@pkgconfigdatadir\@" => "%{prefix}/share/pkgconfig", + "\@pkgconfigdatadir\@" => "%{_prefix}/share/pkgconfig", - "\@ybindir\@" => "%{prefix}/lib/YaST2/bin", - "\@ystartupdir\@" => "%{prefix}/lib/YaST2", + "\@ybindir\@" => "%{_prefix}/lib/YaST2/bin", + "\@ystartupdir\@" => "%{_prefix}/lib/YaST2", "\@plugindir\@" => "%{_libdir}/YaST2/plugin", - "\@includedir\@" => "%{prefix}/include/YaST2", - "\@docdir\@" => "%{prefix}/share/doc/packages/$RPMNAME", + "\@includedir\@" => "%{_prefix}/include/YaST2", + "\@docdir\@" => "%{_prefix}/share/doc/packages/$RPMNAME", "\@logdir\@" => "/var/log/YaST2", "\@vardir\@" => "/var/lib/YaST2", "\@mandir\@" => "%{_mandir}", - "\@execcompdir\@" => "%{prefix}/lib/YaST2", + "\@execcompdir\@" => "%{_prefix}/lib/YaST2", "\@agentdir\@" => "${execcompdir}/servers_non_y2", "\@ydatadir\@" => "${yast2dir}/data", @@ -243,7 +242,7 @@ "\@yncludedir\@" => "${yast2dir}/include", "\@schemadir\@" => "${yast2dir}/schema", "\@scrconfdir\@" => "${yast2dir}/scrconf", - "\@desktopdir\@" => "%{prefix}/share/applications/YaST2", + "\@desktopdir\@" => "%{_prefix}/share/applications/YaST2", '@fillupdir@' => '/var/adm/fillup-templates', "\@LL\@" => "$LL", Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.changes?rev=66231&r1=66230&r2=66231&view=diff ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Tue Oct 4 15:14:17 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 4 15:12:21 CEST 2011 - visnov@suse.cz + +- remove definition of Prefix in spec file (create-spec) +- use _prefix in .spec file +- 2.21.5 + +------------------------------------------------------------------- Fri Sep 30 12:26:20 CEST 2011 - visnov@suse.cz - added 'y2tool obssync' Modified: trunk/devtools/yast2-devtools.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/yast2-devtools.spec.in?rev=66231&r1=66230&r2=66231&view=diff ============================================================================== --- trunk/devtools/yast2-devtools.spec.in (original) +++ trunk/devtools/yast2-devtools.spec.in Tue Oct 4 15:14:17 2011 @@ -36,7 +36,7 @@ autoreconf --force --install %{?suse_update_config:%{suse_update_config -f}} -./configure --prefix=%{prefix} --libdir=%{_libdir} +./configure --prefix=%{_prefix} --libdir=%{_libdir} make @INSTALL@ @@ -59,23 +59,23 @@ %files %defattr(-,root,root) -%{prefix}/bin/y2tool -%{prefix}/bin/yastdoc -%dir %{prefix}/share/emacs -%dir %{prefix}/share/emacs/site-lisp -%{prefix}/share/emacs/site-lisp/*ycp-mode.el -%dir %{prefix}/share/vim -%dir %{prefix}/share/vim/site -%dir %{prefix}/share/vim/site/syntax -%{prefix}/share/vim/site/syntax/ycp.vim -%dir %{prefix}/share/vim/site/ftdetect -%{prefix}/share/vim/site/ftdetect/ycp_filetype.vim -%dir %{prefix}/lib/YaST2 -%{prefix}/share/cmake +%{_prefix}/bin/y2tool +%{_prefix}/bin/yastdoc +%dir %{_prefix}/share/emacs +%dir %{_prefix}/share/emacs/site-lisp +%{_prefix}/share/emacs/site-lisp/*ycp-mode.el +%dir %{_prefix}/share/vim +%dir %{_prefix}/share/vim/site +%dir %{_prefix}/share/vim/site/syntax +%{_prefix}/share/vim/site/syntax/ycp.vim +%dir %{_prefix}/share/vim/site/ftdetect +%{_prefix}/share/vim/site/ftdetect/ycp_filetype.vim +%dir %{_prefix}/lib/YaST2 +%{_prefix}/share/cmake @ybindir@ -%dir %{prefix}/share/YaST2 +%dir %{_prefix}/share/YaST2 @ydatadir@ -%{prefix}/share/aclocal/*.m4 +%{_prefix}/share/aclocal/*.m4 @pkgconfigdatadir@/@RPMNAME@.pc %doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org